MRN-764

Force using long hostnames.
Trap added.

Change-Id: I329620f3c8aa7e7f1bdd658cbaa8ea20d9aa4ba5