Fix for JIRA issue 1242, 1245, 1247

Fix for JIRA issue 1242, 1245, 1247

https://jira.iotivity.org/browse/IOT-1242
https://jira.iotivity.org/browse/IOT-1245
https://jira.iotivity.org/browse/IOT-1247

Change-Id: I93a5f2bf3780ed2dc0ab74cd9701d100c1bbcb87
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11545
Reviewed-by: Masud Bhuiyan <m.parves@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>