Merge "Handle openstack configmap options" into release/2019.2.0