Merge "Update plugin-gwt-archetype to match current implementation" into stable-2.6