Merge "Bug 506814 - Fix export scripts for generators that are broken after switch to Neon in Buckminster"