[Mesa-dev] Clean ups (hopefully last time)

[Timothy Arceri]

Sorry to keep spamming the list with these but a bunch have now landed
and theire was a bug fix and a bunch of rebasing required in the remaining
patches.

Thanks to all that have help review the series so far.

Patches 4-6 is the big change everything else shouldn't be too hard to
review.

Patches 4-6 also need to be squash to avoid compile issues and functionality
regressions. I would like to have split them up more but couldn't see a nice
way of doing it.