Removed amazon lib. Added php-rest-service in composer.json
Merge remote-tracking branch 'origin/propel1.6' into propel1.6