Added ability to build a non-OSGi war, or an OSGi plugin (or both).