make the sanitize method return the same object type that is passed in
basename is apparently not active inside this webapp
make the asset-editing page actually work
Merge branch 'rc/unstable/1.11.90' into 1.12
Improve Syslog NBI implementation to have a NB Impl for
each destination rather than one Impl that iterates
over destinations.  This means each Impl gets its own
queue and worker thread and one won't block the other
if a TCP impl is every used.
Improve Syslog NBI implementation to have a NB Impl for
each destination rather than one Impl that iterates
over destinations.  This means each Impl gets its own
queue and worker thread and one won't block the other
if a TCP impl is every used.
Merge branch 'rc/unstable/1.11.90' into 1.12
Merge branch '1.12'

Conflicts:
	opennms-webapp/src/main/java/org/opennms/web/asset/ImportAssetsServlet.java
fix for OPENNMS-NMS112-15, bad model messing up tests
Merge branch 'rc/unstable/1.11.90' into 1.12
Merge branch '1.12'
NMS-5777 add support for excluding services from remote polling at the JVM level (irrespective of poller package)
user-proofed
trim it too
Merge remote-tracking branch 'origin/1.10' into rc/unstable/1.11.90
Merge branch 'rc/unstable/1.11.90' into 1.12
Merge branch '1.12'
just make sure it's an accepted, empty array
Merge remote-tracking branch 'origin/1.10' into rc/unstable/1.11.90

Conflicts:
	opennms-services/src/test/java/org/opennms/netmgt/poller/remote/PollerBackEndTest.java
Merge branch 'rc/unstable/1.11.90' into 1.12