MB-11106: handle paths with spaces

Change-Id: I7a14abd3e81dcd561b06e970b5c2a5225eef45d1