fix unit test for modtool.path_to_top_of_module_tree
fix remarks
fix remarks
Merge branch 'fix_conflicts' into hmns
Merge branch 'fix_hmns_modpath_extension_loads' into hmns