Initial implementation of NSIv2 r116
Query notification id is now a long
Renamed some more NSIv2 namespaces