Merge "OC+k8s: add roles (primary & secondary) to contrail nodes" into release/2019.2.0