Resolved Merge conflicts, removed previously deleted files

platform/commonUI/edit/src/actions/CancelAction.js

@@ -31,10 +31,8 @@ define(
          * @memberof platform/commonUI/edit
          * @implements {Action}
          */
-        function CancelAction($injector, navigationService, context) {
+        function CancelAction(context) {
             this.domainObject = context.domainObject;
-            this.navigationService = navigationService;
-            this.objectService = $injector.get('objectService');
         }
 
         /**
@@ -66,7 +64,7 @@ define(
         CancelAction.appliesTo = function (context) {
             var domainObject = (context || {}).domainObject;
             return domainObject !== undefined &&
-                domainObject.hasCapability("editor");
+                domainObject.getCapability("status").get("editing");
         };
 
         return CancelAction;