Rebase to new master and fix tests

Author: javierbertoli

spec/classes/nginx_spec.rb

@@ -106,6 +106,7 @@
   tcp_nodelay        on;
   client_max_body_size 10m;
   keepalive_timeout  65;
+  server_names_hash_max_size 512;
   server_names_hash_bucket_size 64;
   types_hash_max_size 1024;