Make it compile on both 6_2 and 4_2
update git-cheatsheet, remove duplicated sections from backportingTo42.txt
Inc retry count
HLT collection as an option
sync