Merge branch 'releases/v4' of ssh://cvs.ou.linutronix.de/people/rw/ubi-cp into ubi2/v4