Gateway Profile updates - AIRAVATA-1318
Merge remote-tracking branch 'origin/master'