[SCM-709] Use JDK Pattern/Matcher instead of RE
[SCM-709] Improve regular expression for 'renamed' matching