Merge proposals dependent on lp:~cisco-openstack/puppet-openstack-cisco/grizzly-puppet-n1k-vsm

1. grizzly-puppet-n1k-vsm
2. Dependent merge proposals