Merge 'origin/master' into wes

Signed-off-by: Kishen Maloor <kishen.maloor@intel.com>
4 jobs for wes in 6 minutes and 26 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
failed #2982
Android_build

00:06:26

passed #2983
doxygen

00:01:12

passed #2980
Linux_Secured_Test

00:03:43

passed #2981
Linux_Unsecured_Test

00:03:12

 
Name Stage Failure
failed
Android_build Build
    ^
symbol: class OCLink
location: class OcLink
3 errors
1 warning
make[1]: Leaving directory '/builds/iotivity/iotivity-lite/swig'
make[1]: *** [Makefile:151: build_jar] Error 1
make: *** [Makefile:344: swig] Error 2
ERROR: Job failed: exit code 1