Bugfixes

- Remove step not needed on common.xml
- Added correct hostname to /etc/hosts (fixes #4545 )