master
Move apache, zabbix, postgresql and rabbitmq state tests into own directories.
Update code to be Py3.7+ to reduce merge forward conflicts
Update to isort 5.10.1
Reformat files with black