OPENAM-5135, CR-5532. Device Id match/save now successfully removes old device profiles, and allows new device profiles to be saved.

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