Interim update.
Fixed one or two places where the real pkg_resources was being used. Test parity with develop achieved.