Minor scap fixes

* Fixed dumb terminal warnings on CDB rebuild step
* Removed literal newline from timing message

Change-Id: Id829307f8e4daf400a850e9802440b0f0d533eb1
Merge "Minor scap fixes" into production