Merge master -> 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/libraries/model/DescriptorModelFields.js
index bdbf403,8b86b0c..d8d9e58
--- 1/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelFields.js
--- 2/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelFields.js
+++ b/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelFields.js
@@@ -27,8 -27,7 +27,8 @@@ export default 
        nsd: common.concat(['constituent-vnfd', 'vnffgd', 'vld']),
        vld: common.concat([]),
        vnfd: common.concat(['vdu', 'internal-vld']),
-       'vnfd.vdu': common.concat(['image', 'external-interface', 'vm-flavor', 'cloud-init', 'filename']),
+       'vnfd.vdu': common.concat(['image', 'image-checksum', 'external-interface', 'vm-flavor', 'cloud-init', 'filename']),
 +    'nsd.config-parameter-map': common.concat([]),
        // white-list valid fields to send in the meta field
        meta: ['containerPositionMap']
  };

diff --cc skyquake/plugins/composer/src/src/stores/ComposerAppStore.js
Simple merge