Use jun04.map for run 50017
Restore missing hodtest_cuts.def file.
Merge branch 'develop' of hallcgit:hcana into develop