Merge "Merge branch 'master' into master_vca_intg" into master_vca_intg
authorkashalkar <kiran.kashalkar@riftio.com>
Tue, 17 Jan 2017 15:46:06 +0000 (16:46 +0100)
committerGerrit Code Review <root@osm.etsi.org>
Tue, 17 Jan 2017 15:46:06 +0000 (16:46 +0100)

Trivial merge