Fixed unknown override user message
moved some queries in various tests to the right place
removed some redundant queries in various tests
added some diff tests
added more notif tests for diff
Allow 2-10 letters in nic-hdl suffix, not 2-6 letters (was not allowing HIA1-AFRINIC).
Update Jetty from 8.1.8 to 8.1.12.
added more notification tests for diff and to test the overall notification message structure
more notification message structure tests
merge with master