AME-3719 Working around svn problems. Committing all work. Need to have conversation about whether this helps or hinders scripted device print

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