Conflicts:
	vcl/source/opengl/OpenGLContext.cxx

Change-Id: I13427cb698d29adb1d19b135ada91bcdfc8b8c92

Change-Id: I91be83485dcd829800ca9611ab54b19d8eae19af

Change-Id: I7445c699bf3fa6419411d4800db1b49f92b77a55

Change-Id: Id4bd8bb8361204ae281a090840b08c502e5b4a7a

Change-Id: I4035318d35d468fa93d4dcfe56f9b0434fd1dfe7

Change-Id: I0d1d73402f11cc61ea9e7629bea34e24c22f5beb

* We need to call xmlInitParser() before using it in a multi-threaded
  way (according to the libxml2 doc).
* Better to use 'rEntity' which references the one stored in the vector
  rather than 'entity' whose copy gets stored in the vector. On Windows
  at least 'rEntity' and 'entity' hold different parser pointer values.
* Free the parser before popping the entity. Popping the entity first then
  freeing the parser using its pointer value stored in the entity looks
  weird.

Change-Id: I6b64a6d8ac9c1d4fea8339d8fb2d38dfffbba47b

Change-Id: I420009e0892a815e0017208c3bb2a90e1533c916

Change-Id: Iaf050d7b574864c27b84919aa3a04eadd25312e0

Change-Id: I59988b27b199ffb50118255026a8d9e5aa3debbd

Change-Id: I9b0ac0ba1b3dce2d37dd514a75523ddcbbaa0111

Change-Id: Ie86244d8180cba07260af4b8c82c4ce588a66528

Change-Id: Iba781628aa39e537d403b1bbbd5c8891d6068026

Change-Id: I78d4184f73a11e0f1ef0a1763d207a9a97ac44ee

Change-Id: I388df85bf547fd159741938307db6e04e6f0a336

Change-Id: I4ca471d9d849b43a60cb34ac81baf023e30891e1

Change-Id: I6eae9754e5fcb465f4f27e8c2896e6cea53fbb7a

Change-Id: Idcbc7a2a88623ce370d0325284d2e8f96a9e2033

Change-Id: I8096a0dfe0478671183c66fd9d1d516ec4ed3537

Change-Id: If49d9f859ce9827adf7f578f5f5d5d421f65fcf5

Change-Id: I4cc45d4391ad724919b2253ca32b4cafa53c796a

Change-Id: Ib1c6dd47b9168845ad1b864ffbda01c1d6a3afe8

Change-Id: I27d2c8caed61096d47970fba2104b61b0141997c

Change-Id: I06fa257210d58fef53eb8cdce44d5559ad0309f1

Change-Id: I1b72decd1ef34575508d39c9ee09bb6e5c3f108b

Change-Id: I317f0d6c48f0936cfe2d2f8707e42d9e7b5aad7d

Change-Id: I859453d7b18bd5f4af7bad25bd0439c1f926b02f

Change-Id: I8f12726aee31dd123861340a85f247ba546bf8a8

Change-Id: I15fb840897556ebef63611ced01468461179203d

Change-Id: I0e2279ebe223d17b2ee2f337faaa69cee956e1c6

Change-Id: I1a892b13d8716c9963f344bb57febbc7118561b2

Change-Id: I32f3396f97e7144f5aa4037d4a312085ac113e3d

Change-Id: I49b2c2f825a23972a0bad321cbb41eb2d8651d8f

Change-Id: I383e7552160c5e12796ddf7cb13058d99032c7f5

Change-Id: I725c39b8cda4f4f395cae2d70f221650f1e2a790

Change-Id: Ic51ddaf05c6377c27dfe81277228b43c305fc632

Change-Id: Ifc64a7e301e9ecaa59890d0363d699eb9ff5812d

Change-Id: I20a3aeef306ca83daa2d78647814ff6bb32ef082

Change-Id: Ic43c07b1530595980794f89f94dfad28771fc155

Change-Id: Ie7f7b7125029b1e0e2935b061d454cd5b6719543