It makes me sad that CatalogUtil.getDeployment() already does a bunch of configuration file parsing and yet more is expanding here...possible to move this there, maybe?