Merging highPt fixes into boostedTaus

Merging on command line works in the strange way, so the way of minimal changes is followed: on the high-pt branch very few changes happened since boostedTaus branch diverged, so highPt is merged to boosted