[BUG #7063] applied new patch.py also to branch_2_1_x
[BUG #7063] some more take-over from master branch, to run patch.py successfully