fixes ZEN-15594: Make the CiscoUCS and UCSCapacity objects.xml files easier to manage.
Merge pull request #610 from zenoss/ZEN-15594

fixes ZEN-15594: Make the CiscoUCS and UCSCapacity objects.xml files eas...