Fix for OPENAM-3831 - review: FR-205

git-svn-id: https://svn.forgerock.org/openam/trunk@9236 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
Fix for OPENAM-3947 - review: CR-3631
Adjusted the server default upgrade to match properties against the list of
valid server properties to prevent removal of custom default settings.

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