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
Squashed commit of the following:

commit ba7fd984840a0d70737f9de9147d15aa89018fac
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Wed May 7 14:40:29 2014 -0400

    Fix incorrect graph name

commit bcb6e3aa5c8a01d98bf6343ecfe844644b3c9260
Merge: 83f55c3 07272e2
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Wed May 7 14:40:02 2014 -0400

    Merge branch '1.12' of github.com:OpenNMS/opennms into feature-moar-daemon-stats-in-mbeans

commit 83f55c3795ec9743de0d0eb009680d33682d219e
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Tue May 6 15:38:17 2014 -0400

    Finish exposing Trapd stats in MBean
    Add Notifd stats in MBean
    Collection and graph definitions for both
it's been rpmsign --resign, not rpm --resign, for a long time
Merge remote-tracking branch 'origin/1.10' into 1.12
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	features/gwt-ksc-combobox/src/main/java/org/opennms/features/gwt/ksc/combobox/client/presenter/KscComboboxPresenter.java
	opennms-services/src/main/java/org/opennms/netmgt/notifd/NotificationTask.java
	smoke-test/src/test/java/org/opennms/smoketest/OpenNMSSeleniumTestCase.java