AME-3719 Merging all changes from my branch in to trunk.
Merging out revision 9857 prior to re-integrate merge
AME-3719 Working around svn problems. Committing all work. Need to have conversation about whether this helps or hinders scripted device print