INTEXT-54 - AWS Fix Failing Tests
For reference: https://jira.springsource.org/browse/INTEXT-54
Merge pull request #34 from ghillert/INTEXT-54

INTEXT-54 - AWS Fix Failing Tests