support for driver mappings, configurable osgi dir, and misc cleanups