Fixed import ambiguity in JCifsMonitorTest.
Updated Karaf to 2.3.1. This fixes a problem where Pax Web wouldn't
reload whiteboard servlets correctly. This should make my day about 10%
easier since I won't have to restart OpenNMS to test OSGi changes! Woo!