Merge pull request #7509 from jasonmolenda/cp/regenerate-swig-bindings-and-update-watchpoint-modify-patch-test-cases

Cp/regenerate swig bindings and update watchpoint modify patch test cases

Author: jasonmolenda