merge cleanly for PR-388

this should make [PR-388](https://github.com/jfryman/puppet-nginx/pull/388) merge cleanly.