Added clause mappings to all object types that reference clauses in orphaned objects
Merge pull request #1145 from reciprocity/hotfix/clause-mappings

Clause mappings for all object types that reference clauses in orphaned_objects
Merge remote-tracking branch 'origin/release/0.9a25' into develop