Merge pull request #3686 from kkrumlian/3.17.x-windows-paths-3

Updating previously added code to work with windows/linux paths regardless of the datainfo.properties configuration

Merge pull request #3656 from rehmanali-oc/OC-21531

OC-21531 - Fix multipage form issue for frozen studies/sites from queries page

[maven-release-plugin] copy for tag 4.13.0