Merge branch 'master' into develop

Conflicts:
	opensrs/domains/bulkchange/bulkChange.php
	opensrs/domains/bulkchange/bulkTransfer.php
	opensrs/domains/provisioning/provModify.php
	opensrs/domains/provisioning/provSWregister.php
	opensrs/domains/provisioning/provUpdateAllInfo.php
	opensrs/domains/provisioning/provUpdateContacts.php
	opensrs/domains/subreseller/subresActing.php
	opensrs/domains/subreseller/subresCreate.php
	opensrs/domains/subreseller/subresModify.php
	opensrs/openSRS_ops.php
	opensrs/trust/trustSWregister.php