PJSM-229: Minor cleanups. Wait for port 8101 instead of waiting 60 seconds. Also make karaf and opennms restart after vm reboot.