Merge "Fix dependentOn for hpaCapability node"