Merge "Fix salt master IP"