move find_objectmap to util for consistency
Merge branch 'master' into feature.brokendelete