Merge proposals dependent on lp://qastaging/~cisco-openstack/puppet-openstack-cisco/cis-havana-scenario_node_terminus

1. cis-havana-scenario_node_terminus
2. Dependent merge proposals