Contribution Pages - Improve related employer autofill

Conflicts:
	CRM/Contribute/Form/Contribution/OnBehalfOf.php
	CRM/Core/Page/AJAX/Location.php

fix location file

reverse folder addition

fix misplaced ; in backport

backport on behalf of php aspects

fix onbehalf update
backport more of onbehalf.tpl changes