revert commits that broke the storage BST and the nightly

This pull request reverts merge 0f0a4809d8df4ec31ff1d2096b2a2e5fc9784c4c (CP-6697) which broke the storafe BST and the nightly, and merge 2ef774c98e12aa072d3cd0d0ec90971521aaef93, which contains fixes for the broken merge but we haven't had time to test it.

Signed-off-by: Thanos Makatos <thanos.makatos@citrix.com>
Reviewed-by: Germano Percossi <germano.percossi@citrix.com>

GitHub: closes #64 on xapi-project/sm