Merge pull request #2047 from shawnsmith/factory-init

JENA-2356: Fix race in QueryEngineRegistry, UpdateEngineRegistry init