svn merge for revisions 1694322 and 1694333 from branch_5x (corresponding to revision 1694314 from trunk) SOLR-7877: TestAuthenticationFramework.testBasics to preserve/restore the original request(Username|Password)