MODE-1859 - Fixed the removal of ModeShape services when a repository is removed. Refactored the general remove & recover operations, as they are very similar.