qtscript: Move before qtwebkit
qtwebkit, qupzilla: Disable again

No, if we don't build webkit2 we still have have the linker errors.
So we disable again those modules.
Disable hawaii-vibe and hawaii-greenisland
Track wayland and weston from master