EUCA-9402, trying to trim a log message that we aren't worried about
Merge branch 'testing' into dev/wwannemacher/EUCA-9402