Merge "N->O Manual puppet commands have the right modulepath." into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Fri, 21 Apr 2017 12:14:55 +0000 (12:14 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 21 Apr 2017 12:14:55 +0000 (12:14 +0000)

Trivial merge