Swap build order for tllsham and tllprivate, now inline with arm/core lab buildmenu's
Increase tlldischarge jump height by 20% was 250>300
Merge lastest lups
Fix merge part 1