Additional compatibility fixes for Robot Framework 2.8+

This has to be removed, since after merging this will no longer be a fork