Merge branch 'origin/gaborone' into gaborone+

Signed-off-by: Kishen Maloor <kishen.maloor@intel.com>
4 jobs for 2.1.1-RC3 in 15 minutes and 42 seconds (queued for 17 minutes and 58 seconds)
latest
Status Job ID Name Coverage
  Build
passed #2035
Android_build

00:09:27

passed #2033
Linux_Secured_Test

00:06:11

passed #2034
Linux_Unsecured_Test

00:03:35

passed #2036
whitespace_and_doxygen

00:01:19