Bug 531057- JUnit 5 support for tests

 - Revert counting aborted tests as failures
 - Check if errors are being counted separately to failures and if so,
add to the total

Change-Id: I866e5dd1f25a87271ba4cb65568b888fcb8dfe8d
Signed-off-by: Lucas Bullen <lbullen@redhat.com>