Fix formatting of logging

Signed-off-by: Si Beaumont <simon.beaumont@citrix.com>
Fix artifacts in config for multiple branch support

Signed-off-by: Si Beaumont <simon.beaumont@citrix.com>