JUnit report should contain subfolder name

This reduces ambiguity of JUnit reports for feature files with the same name but placed in different folders
Tweak pull-request #176.
Use relpath instead of string manipulations.
Fix one case to ensure that subfolders are always included.