same with container/features
Merge remote-tracking branch 'origin/1.12'
fix smoke test for missing location monitor link
skip going to the admin page from here
fix unit tests to find new distributed status string
allow setting log level with a property

Also, change the smoke tests run from Bamboo to use INFO by default.
only remove the repo RPM if necessary
Applying the fix for NMS-4902 on PhysInterfaceTableTracker.

The way to process the ifPhysAddress was changed in IfTableEntry because
of NMS-4902 (added the MAC address handling from IpNetToMediaTableEntry
to IfTableEntry). The fix for NMS-5418 didn't include the same
post-processing of the MAC Address which is not correct.

Now both clases are going to provide the same functionality regarding
the MAC address.
don't build keystore in assembly, do it as a separate step

Conflicts:
	opennms-full-assembly/pom.xml
same with container/features
add a profile that builds full assembly in a normal compile (for bamboo)
refactor this test to allow for timeouts
Merge remote-tracking branch 'origin/1.12'
refactor this test to allow for timeouts
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	core/icmp-jna/src/test/java/org/opennms/jicmp/jna/NativeSocketTest.java
refactor this test to allow for timeouts

Conflicts:
	core/icmp-jna/src/test/java/org/opennms/jicmp/jna/NativeSocketTest.java
fix merge issue
Fix for NMS-6063 (Distributed map offered when no monitoring locations defined)
[bamboo] Automated branch merge (from 1.10:20ecfe3bc7e72ef43526ebb054133ff933ece35f)
fix for OPENNMS-NMS14-UNIT-3, change to distributed status text