mgmt_system.py polishing
Fixed service catalog to use Tree instead of xpath
Merge pull request #658 from mfalesni/mgmt_system_polishing

mgmt_system.py polishing
Merge pull request #657 from psav/fix_catalog

Fixed service catalog to use Tree instead of xpath
Merging changes.