merged conf files
updating install
Merge branch 'NGINX_PHP_FPM' of github.com:rs-services/cookbooks_internal into NGINX_PHP_FPM