Standalone Tomcat run as a service on Windows is not discovered in JBoss ON

Issue

• After configuring Tomcat on Windows for discovery, it does not show up in discovery queue
• After the inventory I can see the new platform with CPU, File Systems, Network Adapter and RHQ Agent but I don't see the Tomcat JVM
• Tomcat resource is not discovered and log file shows the following exception:

ERROR [ResourceDiscoveryComponent.invoker.daemon-46] (jboss.on.plugins.tomcat.TomcatDiscoveryComponent)- Error creating discovered resource for process: ProcessScanResult: scan=[ProcessScan: query=[process|basename|match=^(T|t)omcat(5|6|7)\.exe], name=[WindowsEWSTomcat]], info=[process: pid=[4800], name=[C:\tomcat-6_0_36\bin\tomcat6.exe], ppid=[560]]
java.lang.NullPointerException
    at org.jboss.on.plugins.tomcat.TomcatDiscoveryComponent.determineCatalinaHomeOnWindows(TomcatDiscoveryComponent.java:386)
    at org.jboss.on.plugins.tomcat.TomcatDiscoveryComponent.parseTomcatProcess(TomcatDiscoveryComponent.java:251)
    at org.jboss.on.plugins.tomcat.TomcatDiscoveryComponent.discoverResources(TomcatDiscoveryComponent.java:126)
    at sun.reflect.GeneratedMethodAccessor74.invoke(Unknown Source)
    at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
    at java.lang.reflect.Method.invoke(Method.java:597)
    at org.rhq.core.pc.util.DiscoveryComponentProxyFactory$ComponentInvocationThread.call(DiscoveryComponentProxyFactory.java:305)
    at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
    at java.util.concurrent.FutureTask.run(FutureTask.java:138)
    at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:885)
    at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:907)
    at java.lang.Thread.run(Thread.java:619)

• Standalone Tomcat started as a service is not discovered by the JBoss ON agent