Crm 10859 - whitespace cleanup

I abandoned working on the BAO rename when I realised the tests are no longer up to scratch but might as well pull in the preparatory whitespace (trailing spaces) clean up I did