[refs boto/boto#1302] - adds a return value to set_contents_from_filename
Add unittest for  #1339
Merge branch 'ohe-develop' into develop

* ohe-develop:
  Add unittest for  #1339
  [refs boto/boto#1302] - adds a return value to set_contents_from_filename