Ds 1510

This pull request is mangled beyond repair, and a replacement has been offered as pull request 300.  Please delete this request, with my apologies.

Was:  Fix for https://jira.duraspace.org/browse/DS-1510