Remove the need for hawtio-osgi

Doing this through a pull request, because it might require some discussion. I think the separation between hawtio-web and hawtio-osgi is awkward and not needed (any more). From a comment in hawtio-web I gather that maybe the separation was needed for JBoss-AS. However I just tried this with 7.2.0 (both with and without OSGi profile) and this issue seems to be resolved.
I didn't remove hawtio-osgi yet, but if this commit goes in I think it can be removed.

Below is the commit message:
hawtio-osgi used to add the OSGi manifest (created in hawtio-web) to the WAR file, making it a WAB. However, an OSGi manifest can also be added to a plain WAR file making it both a WAR and an OSGi WAB at the same time.
Another issue with the previous setup was that because the OSGi manifest was generated in hawtio-web but applied in hawtio-osgi the identity (Bundle-SymbolicName) of the hawtio-osgi WAB was set to hawtio-web which is incorrect. This commit resolves that as well.