Trivial fixes.
Merge branch 'milestones/m2.1' of github.com:ninech/puppetlabs-openstack into milestones/m2.1

Conflicts:
	manifests/common/ovs.pp