[PATCH 0/5] Control node master fixes v2

[Thomas Hellstrom]

After a previous patch series and a discussion with Daniel Vetter and
David Herrmann, I've reworked the patches a bit. Please review.

Patch 1,2 and 5 already reviewed.

Thanks,
Thomas