Controls owned by Directives are now unmapped rather than deleted on unmap
Merge pull request #318 from reciprocity/feature/mapped_controls_unmap

Controls owned by Directives are now unmapped instead of deleted