Merge branch 'v1.0'

Signed-off-by: velandy <rajesh.velandy@riftio.com>

diff --cc models/openmano/python/rift/openmano/rift2openmano.py
Simple merge

diff --cc models/plugins/yang/mano-types.yang
Simple merge

diff --cc models/plugins/yang/nsr.yang
Simple merge

diff --cc models/plugins/yang/vnfr.yang
Simple merge

diff --cc rwcal/plugins/vala/rwcal_openstack/rwcal_openstack.py
Simple merge

diff --cc rwcal/plugins/yang/rwcal.yang
Simple merge

diff --cc rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py
Simple merge

diff --cc rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py
Simple merge

diff --cc rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py
Simple merge