[IOT-1753] After-merge code review comments
[IOT-1753] After-merge code review comments

Change-Id: Ibebbad962e6c9626f8387e16aabd558f496de667
Signed-off-by: Andrii Shtompel <25499a78f7e7032392a327573ae90c1e2a94b983@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16877
Tested-by: jenkins-iotivity <d95b56ce41a2e1ac4cecdd398defd7414407cc08@iotivity.org>
Reviewed-by: Phil Coval <ff46fec9739d31cce915aabcc3a7a2c00eee4d6c@osg.samsung.com>
Reviewed-by: Kevin Kane <cd40c34e976f30c9e62efcf24e04c516bc3a3b05@microsoft.com>

iotivity/iotivity,iotivity/iotivity,rzr/iotivity,iotivity/iotivity,iotivity/iotivity,rzr/iotivity,iotivity/iotivity,rzr/iotivity,rzr/iotivity,rzr/iotivity,rzr/iotivity,rzr/iotivity,iotivity/iotivity,iotivity/iotivity,iotivity/iotivity