Adding CPP namespaces to address - AIRAVATA-1334
Merge remote-tracking branch 'origin/master'