To fix build, also squashed in:

Author: Miklos Vajna <vmiklos@collabora.co.uk>
Date:   Sun Dec 14 15:18:58 2014 +0100

    upload libcmis 0.5.0

Author: Mihai Varga <mihai.mv13@gmail.com>
Date:   Mon Aug 11 13:23:53 2014 +0300

    SharePoint binding settings, part 1

    Conflicts:
        officecfg/registry/data/org/openoffice/Office/Common.xcu

Change-Id: I45eb81a0139c42864f93ad89c4a31185f3ac5bd6