The fix consists of forcing the smart update, so the position is updated even if the date is not changed. This way the new client position is discarded.
Now filtering is applied by default only to files matching "*spring-config*.xml" and "*hibernate.cfg*.xml" located directly under "src/{main,test}/resources". After installing the patch, remember to execute "mvn clean install" from root directory.