Merge "Fix netconf-userfeatures using deprecated verify job template"