DEVOPSTWO-331 #comment fixing more directories from the forked module.