U4-4927 Image Cropper Crop URL is wrong in 6.2.0

Reverts part of 067268a96e472a888aeeae10762b0967b4127a99 which was refactored wrong
Merge remote-tracking branch 'origin/6.2.1' into 6.2.1