Merge remote-tracking branch 'origin/release_1.22.0'

Change-Id: I4dbbd5efb49c68ea5422cdfd295d90fe9344f215
Signed-off-by: Eugen Neufeld <eneufeld@eclipsesource.com>