[ros-diffs] [cwittich] 39528: remove some more junk from hive files