fixing bug with parameters still being specified in the create method even when not injected
fixed conflift
Merge branch 'master' of github.com:archii/raxapitest
replacing last test_heat_chef usage with test.py for building nginx-php-fpm platform with chef