Also, I brought in a different pull request that affects the ResourceLocator logic. Could you make sure the current master branch is still working with your OSGi environment?
Nathan
Nathan