Conflicts:
service/easy-setup/enrollee/src/resourcehandler.cpp
service/easy-setup/mediator/csdk/src/provisioning.cpp
service/easy-setup/mediator/richsdk/android/EasySetupCore/build.gradle
service/easy-setup/sampleapp/enrollee/arduino/enrolleewifi.cpp
service/easy-setup/sampleapp/mediator/android/EasySetup/app/build.gradle
service/easy-setup/sdk/enrollee/src/easysetup.cpp
Change-Id: Ia4fc8d02ebdadc1f71c2b0e40d39d7ad66ba682c
Signed-off-by: lankamadan <lanka.madan@samsung.com>