make timeouts longer, change to non-routable IPs
Merge branch '1.12' of github.com:OpenNMS/opennms into 1.12
Merge remote-tracking branch 'origin/1.12'