Merge "updates for R3 packaging improvements SO and UI do not have to share build...
authormarchettim <mmarchetti@sandvine.com>
Sat, 30 Sep 2017 21:40:17 +0000 (23:40 +0200)
committerGerrit Code Review <root@osm.etsi.org>
Sat, 30 Sep 2017 21:40:17 +0000 (23:40 +0200)

Trivial merge