Formatting in EventTranslator bits
Improving JUnit tests for ResourceDao.findTopLevelResources()

Now, each of the typical 6 scenarios is going to consider orphan nodes,
I mean, nodes that are defined on the DB but don't have RRDs, and nodes
not defined on the DB but have RRD directories associated (like deleted
nodes).
Merge remote-tracking branch 'origin/1.12'
Used "ours" to ignore 1.12 whitespace changes in EventTranslator,
EventTranslatorConfig, EventTranslatorConfigFactory classes, then
reformatted in master.
Manually pull in commit 689dd9ce6bf5a4659325aeb7d9c265468202822f which
I missed in my "ours" merge (commit c5a0c148f7e067a8d57c839c594d0de0e77772c2
Fixing DefaultResourceDao.findNodeSourceDirectories()

There was an invalid filter used on that method that was preventing
listing all the node resources properly when storeByForeignSource is
enabled.

FindTopLevelResourcesTest has been updated to validate that it should
work as expected.

Solution also tested on running environment.
Displaying storeByForeignSource on /admin/sysconfig.jsp
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-dao/src/main/java/org/opennms/netmgt/dao/support/DefaultResourceDao.java
	opennms-dao/src/main/java/org/opennms/netmgt/dao/support/RrdFileConstants.java
Add missing dependency on features.collection.api in protocols/xmp POM
update phantomjs driver to 1.1.0
reenable phantomjs tests
missing imports
bump selenium version
package changed with newer selenium
more attempts to make phantomjs work
change this a bit to be generic
Made OpenNMSSeleniumTestCase more strict by throwing exceptions by default.

Conflicts:
	smoke-test/src/test/java/org/opennms/smoketest/OpenNMSSeleniumTestCase.java
bump selenium version, refactor the test base a bit

Conflicts:
	smoke-test/pom.xml
	smoke-test/src/test/java/org/opennms/smoketest/OpenNMSSeleniumTestCase.java
fix NPE in rendered javascript
Merge remote-tracking branch 'origin/1.10' into 1.12

Conflicts:
	smoke-test/pom.xml
	smoke-test/src/test/java/org/opennms/smoketest/DistributedMapTest.java
	smoke-test/src/test/java/org/opennms/smoketest/MenuHeaderTest.java
	smoke-test/src/test/java/org/opennms/smoketest/OpenNMSSeleniumTestCase.java
fix 1.12 imports