pegasus-s3: Add better support for location constraints