fixed provisioner and upgrader
more keymanager tweaks
keymanager tests pass, ALL TESTS PASS