Merge DEV/SEAMIST4 to HEAD (part 2 of 2)

12421 Tidy up and trivial code changes mostly relating to code style.
            Good exercise for learning code though.
            Tests re-run successfully.
            Ready for merge to HEAD.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12666 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/cmis/ws/AuthenticationTokenCallbackHandler.java

@@ -64,7 +64,6 @@ public class AuthenticationTokenCallbackHandler implements CallbackHandler
 
     private String getPassword(String userName)
     {
-        // TODO Auto-generated method stub
         return userName;
     }