Fix replacement of payment object

git-svn-id: https://svn.typo3.org/TYPO3v4/Extensions/commerce/branches/55612@85199 735d13b6-9817-0410-8766-e36946ffe9aa
Cleanup

git-svn-id: https://svn.typo3.org/TYPO3v4/Extensions/commerce/branches/55612@85201 735d13b6-9817-0410-8766-e36946ffe9aa