Merge branch 'support-create-local-bind-dirs' into timeout-and-localbinddirs

Signed-off-by: Maxime Petazzoni <max@signalfuse.com>

Conflicts:
	tests/test.py