Making compatible with Spring updates in MP 4.8, ref# FIN-12507#30

fredthe4th wants to merge 3 commits intomasterExclamationLabs/connector-zoom:masterfrom

feature/FIN-12507_base_upgradeExclamationLabs/connector-zoom:feature/FIN-12507_base_upgradeCopy head branch name to clipboard