Merge branch 'willsalmon/log_formating' into 'master'

Add more log formatting options

See merge request BuildStream/buildstream!1125