Merge "Removed commented out code"
authorkashalkar <kiran.kashalkar@riftio.com>
Fri, 21 Oct 2016 15:40:00 +0000 (17:40 +0200)
committerGerrit Code Review <root@osm.etsi.org>
Fri, 21 Oct 2016 15:40:00 +0000 (17:40 +0200)

Trivial merge