TMSS-717: merge commissioning fixes back to master
TMSS-717: merge commissioning fixes back to master Intermediate merge to get the latest and greatest commissioning fixes into master so they are available for new branches. I'm assigning myself as reviewer (auke is on holiday, jd is quite busy). There are no shocking/major changes, and commissioning is an ongoing process.
Edited by Jorrit Schaap