Remove trailing whitespace from xml and php files

Fixes #