Some further small changes to fix imports to use one source of isatab config xmlbean stubs.