JBIDE-16358 - separate catalog out

JBIDE-16358 - test cases