Merge "Unhardcoding salt master name from cluster model." into release/proposed/2019.2.0