Move label display logic into the Label macro

tests/routes/applications/test_settings.py

@@ -23,11 +23,8 @@ from atst.routes.applications.settings import (
     filter_env_roles_form_data,
     filter_env_roles_data,
     get_environments_obj_for_app,
-<<<<<<< HEAD
     handle_create_member,
     handle_update_member,
-=======
->>>>>>> Move display status logic to be a property of an ApplicationRole
 )
 
 from tests.utils import captured_templates