Fixed service catalog to use Tree instead of xpath
Merge pull request #657 from psav/fix_catalog

Fixed service catalog to use Tree instead of xpath