AME-4247, CR-4270

git-svn-id: https://svn.forgerock.org/openam/trunk@10143 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
OPENAM-4354 - Initialise mocks per test method so that ordering doesn't matter (reviewed in hipchat by Peter Major)

git-svn-id: https://svn.forgerock.org/openam/trunk@10146 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d