Merge branch 'server' of https://github.sec.samsung.net/RS7-SECIOTSRK/iotswsec into...
authorm.dalakov <m.dalakov@samsung.com>
Mon, 23 Oct 2017 15:05:57 +0000 (18:05 +0300)
committerm.dalakov <m.dalakov@samsung.com>
Mon, 23 Oct 2017 15:05:57 +0000 (18:05 +0300)

Trivial merge