Use the correct (synthetic) gateway_txn_id

Recurring GC donations all share an order id, so we append the -effort_id.

We have been omitting the "RECURRING" component of contribution.trxn_id forever.

Clean up small unused things.

Change-Id: I232b81758c63d236e79ed3893c6f69a2955adc93
Merge "Use the correct (synthetic) gateway_txn_id"
Merge remote-tracking branch 'origin/master' into deployment

Conflicts:
	sites/all/modules/recurring_globalcollect/tests/RecurringGlobalcollectTest.php
	sites/all/modules/wmf_common/tests/phpunit/WmfTransactionTest.php

Change-Id: I18d49f9733387c156dc7b6e3c6ca135b9f58899e