Scality svn

Fix issues https://github.com/scality/Droplet/issues/147 and https://github.com/scality/Droplet/issues/148