Put back some whitespace errors to fix up some merge conflicts
Merge pull request #756 from Metaswitch/whitespace_errors

[No review required] Put back some whitespace errors to fix up some merge conflicts