Update keymanager auth to interact with webapp v2 (Closes #5120).
Merge remote-tracking branch 'refs/remotes/drebs/feature/5120_update-keymanager-to-webapp-v2' into develop