Updated OSGi/WAR builds.