Removed retry count from feature and scenario ids and added it to the feature names