Fix for OPENAM-2089, review CR-3689.

git-svn-id: https://svn.forgerock.org/openam/trunk@9324 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
CR-3787 - AME-3630 - Ensure old deviceprint module only appears for upgrades and not fresh installs

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