Merge "RIFT-14721"
authorvelandy <rajesh.velandy@riftio.com>
Wed, 5 Oct 2016 17:26:10 +0000 (19:26 +0200)
committerGerrit Code Review <root@osm.etsi.org>
Wed, 5 Oct 2016 17:26:10 +0000 (19:26 +0200)

Trivial merge