Fix Bug#7007 & #7010
Fix Bug#7007 & #7010

ADVANTECH-Corp/node-alljoyn,ADVANTECH-Corp/node-alljoyn,ADVANTECH-Corp/node-alljoyn,ADVANTECH-Corp/node-alljoyn,ADVANTECH-Corp/node-alljoyn,ADVANTECH-Corp/node-alljoyn,ADVANTECH-Corp/node-alljoyn,ADVANTECH-Corp/node-alljoyn