I'd have frozen/baselined 1.5x a long time ago and stopped providing fixes to the customer/community and focused on the 2.x branch.

I'm sure(ish) ED will be incorporating the fixes for 1.5 within the 2.5 branch but as it stands at the moment they still have 2 live dev branches going and are still releasing content/campaigns that only work in any one of them. Everything they are releasing will still need another pass of integration/functional testing before they can even think of releasing 2.5.

It will probably just add up to further delays and a 2.5 release which is full of minor bugs that they don't have time to look at.....a problem that should never exist and wouldn't have done if they had focused on the merge as the number 1 priority...and not the Normandy map and Spit which have dependencies within 2.5. Another 2 pieces of the puzzle which will need further testing after 2.5 is released!