Additional tweaks per pull request review.
Additional tweaks per pull request review.

att-comdev/openstack-helm,ss7pro/aic-helm,att-comdev/openstack-helm,andrecolin/openstack-helm,att-comdev/openstack-helm,ss7pro/aic-helm,andrecolin/openstack-helm