Development

Fixed the code as the warning did not work correctly in all cases.
Removed todo in test as we now check the log and see that the warning is existing.
Merged upstream with latest changes (all tests still run green)

Note: slf4j-test gets used in gradle build for testCompile, this is a slf4j modification specifically for getting access to the log from the test.