From: Philip Joseph <philip.joseph@riftio.com>
Date: Tue, 18 Apr 2017 14:12:02 +0000 (+0000)
Subject: Merge from SO/master to SO/projects
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F80%2F1580%2F1;p=osm%2FSO.git

Merge from SO/master to SO/projects

Change-Id: I89cba164c73b35407481e4805fe29de30b4ddf2f
Signed-off-by: Philip Joseph <philip.joseph@riftio.com>
---

f4f0f0e00bc886b4af42c5ee68cfacae43b5124b