Add server_name and host back to server object
Merge branch 'develop' of github.com:dreamfactorysoftware/lib-php-common-platform into develop