Merge branch 'stable-2.11' into 'master'

No commits included, merge executed only for release-management purposes
and applying future fixes on both stable-2.11 and master.

Change-Id: I0fe480719f3f9083d44bfaa01dbd9ef43591ccca