Merging master to master_vca_intg

Signed-off-by: Kiran Kashalkar <kiran.kashalkar@riftio.com>

diff --cc skyquake/plugins/composer/api/composer.js
Simple merge

diff --cc skyquake/plugins/composer/src/src/components/CanvasPanel.js
Simple merge

diff --cc skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js
Simple merge

diff --cc skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaProperty.js
Simple merge

diff --cc skyquake/plugins/composer/src/src/libraries/utils.js
Simple merge