Merge pull request #179 from telefonicaid/hardening/175

hardening/175
Fix the behaviour when trying to create elements in a deleted but not purged state
Fix issues raised during code review
Merge pull request #183 from telefonicaid/bug/101

bug/101 (into develop)