LibreOffice from Collabora versioning

Change-Id: Iff7004808f9637f3dbc6393751246c3a82134487
shell build fix on Windows

Change-Id: I500f8a86bb9bca5532577a37268b94fb8a8c8b16