(cherry picked from commit 4757ffcc)

Conflicts:
	libcdr/ExternalProject_libcdr.mk

Change-Id: Icdf57cb8a40256b4a474ededd3ba030bd79497f4

Trying to fix a boost::property_tree::json_parser error on windows

(cherry picked from commit 41d2b58b)

Conflicts:
	boost/UnpackedTarball_boost.mk

Change-Id: Iea3ec9a56eb008c6a0729a151b392f1e62925720

Trying to avoid linking with boost on Windows

Change-Id: Ic0c538dfad88f850d95f417f2741ef7dba7fc5e4
(cherry picked from commit 1e392ea7)
Reviewed-on: https://gerrit.libreoffice.org/3559Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Tested-by: Michael Meeks <michael.meeks@suse.com>