Merge "Updated platform"
authorkashalkar <kiran.kashalkar@riftio.com>
Thu, 22 Dec 2016 19:12:34 +0000 (20:12 +0100)
committerGerrit Code Review <root@osm.etsi.org>
Thu, 22 Dec 2016 19:12:34 +0000 (20:12 +0100)

Trivial merge