Merge "N->O Manual puppet commands have the right modulepath." into stable/ocata