Updating ComputeResources descriptions - AIRAVATA-1203
Merge remote-tracking branch 'origin/master'