Rebase swiftonfile to swift 2.1.0 release

Change-Id: I10776fe7d4e3069201775ec6ceae96fd3db32125
Signed-off-by: Prashanth Pai <ppai@redhat.com>
Merge "Rebase swiftonfile to swift 2.1.0 release"