Interops test fixes

Hrotti now passes the Eclipse Paho interops tests, I have fixed up the
persistence mechanism and using the new router code.