Minor fix to remove extra colon from logging

Some log messages with no file context include a colon delimiter following
[<PHASE>], which looks strange and is not desired. Fix includes minor tweak to
a few tests' expected output.
Merge branch 'bugfix/log-extra-colon' into dev