Incorporated all Tamil's comments, nut #4 (branch "firefly-original" for s3tests)

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>