Merge branch 'origin/master' into 'origin/maintenance'

* master:
  [471950] Fixed NPE while starting target platform without installation.

Change-Id: I34f32de7526144b269e273cca0a5e670ae50540f
Signed-off-by: Pavel Agapov <pavel.agapov@xored.com>