Fixes #470.

Was already merged in Bitbucket before import, marked as merged by the import user

Reimplementation of shelve and unshelve commands + deprecation of code related to attic-shelve.