System/Proc mapping on import fixes
Merge pull request #271 from reciprocity/feature/carlos_mapping_fixes

Fixes import mapping for sub processes and sub systems