[ticket/12581] Remove the extra spaces before the &

PHPBB3-12581
[ticket/12581] Better wrapper for the proxy factory

PHPBB3-12581
[ticket/12581] Update the clean-vendor-dir target in bluid.xml

PHPBB3-12581