Merge tag '1.21.0'

Release 1.21.0

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