At the end I think I also fixed with upstream merge_request 31 the failure
So, changes (attached) are: 1) add unity integration B-D 2) add 30.patch proposed upstream to fix FTBFS when building twice 3) add 31.patch proposed upstream to fix FTBFS with parallel builds. G.
diff
Description: Binary data
