Configuration fixes. (spring tests fail otherwise)
Small test cleanup.
Spring schema fix, added default aws host header.
Merge pull request #785 from mdogan/fix/3.1/small-fixes

Small fixes for errors appeared during maintenance tests..