Re-disabled the two itests failing on the CI-Server again, even after the recent upgrade to AMQ 5.9.
Let's make use of empty collections/arrays instead of null values which implicity would also simplify the coding effort as well.