Folding paths into propLists

Change-Id: I1abc8e69ef452f22c0f464126bc72c2a28c03fb5