Merge the upstream changes into the main branch

This MR adds a job to grab any changes from the upstream repo https://github.com/zaproxy/zaproxy.git and merge them into the default branch