Do not fail with NPE when hostname resolution fails
Add dependency towards OSGi's RemoteConstants class
Remove bad looking comment