Better validation of 'Service catalog' / 'Device environment' fields.
Merge pull request #1174 from xor-xor/sc_validation

Better validation of 'Service catalog' / 'Device environment' fields.