Fail rm gracefully

Change-Id: I4e4460a94635f35e090b6f9e0a617d66bc450f4f
Swift updates

* Add some Javelin test files to swift storage
* Remove call to swift_init()
  * (re)Create cache dir
  * (re)Mount backing disk

Change-Id: I14c1d50c13563cbc5fbb71de014e318951b6f62b
Merge branch 'swift-fixes' into dt-test
Merge branch 'cinder-fix' into dt-test