This is what I have so far:
- 086a62e82d9dc3bfa66b57d738ba9f94a641ffad Don't attempt to rename dist if it is already named correctly
- a46df9dbfe14df0df60c8cc401221c4128ad675e Remove an unnecessary 'createDirectoryIfMissing' call. (cherry picked from commit 5c46e7853a09a484698064824b7bf72c5c761993)
- 5b63fce601997009376522c5de9b11275c3681ee Treat all flags of a package as interdependent.
- 302b0dce271bf194b42afa3f90c57cffff35cc72 Print full build log instead of only the last 10 lines
- ffd67e5e630766906e6f4c6655c067a79f739150 Allow template-haskell to be upgradable again
Note that the commit IDs are different since these are cherry-picked form master.