Merge candidate, contains fixes for various issues.

Fixes for various issues, most affect the `abb_common` package. Some are in preparation for the move to Hydro.

All (build) tested on Groovy.