change format of OS_LOG_AND_ASSERT
Merge remote-tracking branch 'origin/release-14.04' into release-14.04