Merge "Fix plugin loading when running as hosted WAR or GWT DevMode." into stable-2.5