OPENAM-6771 Review by HipChat Fix upgrade with interim fix until OPENAM-6380 is resolved
AME-7527/AME-7636 CR-7541 Add pending request datastore
Fix for AME-202 - review: CR-802