Fix broken nginx puppet manifest
Merge branch 'master' into hostapd