fixes #3325 - warning on upload if personal note exceeds 4000

* Warning added on upload personal note if note exceeds 4000 (hard to do ...)
* Merge modified to compare only first 4000 chars of provider note
* Test added for merge