ubc3 merge into machinekit/master

this brings all relevant commits from github/mhaberler/unified-build-candidate-3 as well as git.linuxcnc.org/master.