Merge branch '1.4-rel' (2116f2d) 71/26071/2
authorPhilippe Coval <p.coval@samsung.com>
Mon, 9 Jul 2018 15:59:43 +0000 (17:59 +0200)
committerPhilippe Coval <p.coval@samsung.com>
Mon, 9 Jul 2018 15:59:47 +0000 (17:59 +0200)
Relate-to:
      I2c9e39600e4d336b5a01dacf50aef8d79caac1e0
      I560830d62bad76447bf1c4acaf004cc779fbcdfb
      If23e5c258e61298e6b10996402b0961b2ebcd672

Change-Id: I2116f2d2d86ef45f7d5eca8074279c7c935c6b0d
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>

Trivial merge