Resolve conflicts with other test type that was added to dev branch
Resolve conflicts with other test type that was added to dev branch

rackerlabs/django-DefectDojo,rackerlabs/django-DefectDojo,rackerlabs/django-DefectDojo,rackerlabs/django-DefectDojo