more cleanups, a fix for obsolete ip scanning in MockNodeDao, and lots of provisioner test fixes