All is not well and Dubai rulers managed to hold their ground up to this crisis. Old Shk Maktoum must be "very upset" wherever he is.
Abu Dhabi rulers no longer believe in the usual "brotherhood" and now will "pick and choose to help" Dubai. Now, it'll be anyone's guess what they'll do and how.
Just a hint about aviation in the UAE in the last 25 to 30 years. In the late 80s or early 90s, Abu Dhabi rulers wanted to quit GF and asked the Dubai rulers for EK to be based in Abu Dhabi, and Dubai refused. Dubai's (little) concession was the DXB-AUH-LGW-AUH-DXB flight (not daily, I think) which had little result. Remember how Abu Dhabi quit GF and asked them to cut by 80% their movements through AUH? I'm sure there are more.
For those who have lived here for some years, do you remember the saga of the Burj Al Arab silhouette on the Dubai car registration plates and how it was solved? The fittest rules. These little things have a price and yes, Abu Dhabi will pick and choose "their help" to Dubai. The mutual back scratching is over, but it won't be noticed clearly in public or in the worldwide media.