fix server_name
Merge branch 'develop' of github.com:pronix/foreman into develop