Merge "Add os-ctl-vip address to ctl nodes" into release/proposed/2019.2.0