Merge "Moving manila parameters from cluster to system level"