(cherry picked from commit 2b2128d0)

Conflicts:
	extensions/source/propctrlr/formmetadata.cxx

Change-Id: Ic6d708454009e8023dc2e601043409377fd6cb34