Fixes boolean conversion logic in ColorPickerConfigurationEditor, Fixes tree grouping logic and moves groups cache to the ApplicationTreeService, fix other merge issues

src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js

@@ -108,7 +108,7 @@
                         }
                         else {
                             // From: https://stackoverflow.com/a/51789597/5018
-                            var type = vm.src.substring(vm.src.indexOf("/") + 1, scope.src.indexOf(";base64"));
+                            var type = vm.src.substring(vm.src.indexOf("/") + 1, vm.src.indexOf(";base64"));
                             if (type.startsWith("svg")) {
                                 vm.isCroppable = false;
                                 vm.hasDimensions = false;

src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js

@@ -130,7 +130,8 @@ angular.module('umbraco')
          * @param {any} crop
          */
         function crop(crop) {
-            $scope.currentCrop = crop;
+            // clone the crop so we can discard the changes
+            $scope.currentCrop = angular.copy(crop);
             $scope.currentPoint = null;
 
             //set form to dirty to track changes