now for 5.4.0 master and dropping abreviations

Change-Id: I72dbbab2688709e8266be93b40040c4c6c970d55
Reviewed-on: https://gerrit.libreoffice.org/31217Reviewed-by: Heiko Tietze <tietze.heiko@googlemail.com>
Reviewed-by: jan iversen <jani@documentfoundation.org>
Tested-by: jan iversen <jani@documentfoundation.org>