NMS-5703: Remove timeout, retry, and port parameters from SNMP-based poller services
Fix for the enhancement NMS-5705
When fixing NMS-5426, Benjamin introduced a change in HttpCollector to let it parse the data according to various locale: first the HTTP response's locale, then openNMS' system locale, then Locale.ENGLISH.

The way HttpCollector tried to devise the HTTP response's locale was flawed.

This patch solves this flaw; Now, HttpCollector devises HTTP responses' locale based on the "Content-Language" HTTP header if present.
format
NMS-5695 replace google-collections with the guava version we use in the selenium monitor
Merge remote-tracking branch 'origin/1.10' into space-integration-12.3-code-freeze-branch
Merge branch 'space-integration-12.3-code-freeze-branch' into space-integration

Conflicts:
	opennms-base-assembly/src/main/filtered/etc/poller-configuration.xml
gnore exception about failing to delete log file
make sure test calls afterPropertiesSet on manually initialized Repo
fix broken ReloadContainer
Merge branch 'space-integration-12.3-code-freeze-branch' into space-integration