8.6.x

Attempts to merge the 2 8.6.x branches and ensure Designer is able to work across both kepler and luna TPs. Most importantly, it address TEIIDDES-2333 which was a major reason for the 2 branches in the first place.

If accepted then this should be merged in and a new 8.6.x branch created while the 2 old branches are removed.