Adapting commits from master minors

viewLog.html?buildId=4177&tab=buildResultsDiv&buildTypeId=bt7