Fix S3 object size check - EUCA-10065
Merge remote-tracking branch 'origin/dev/sjones/EUCA-10065' into testing