Fixing unmerged files.
Finished test for Amazon Payments; Minor fixes for the Amazon Payments module that were discovered in tests.
Added a selenium test PayPal Express Checkout and fixed minor issues discovered in testing.
Merge pull request #1526 from Martynas-P/master

Selenium test for Amazon Payments