Tidied up 3.3.0 patches and added 9999-reconfigure-d.patch
Tidy up script changes