Changes from master

viewLog.html?buildId=9410&tab=buildResultsDiv&buildTypeId=bt7
viewLog.html?buildId=9409&tab=buildResultsDiv&buildTypeId=bt6
viewLog.html?buildId=9408&tab=buildResultsDiv&buildTypeId=bt5