CBLT-82:  use separate PREFIXD (directory) and PREFIXP (param)

Change-Id: I5e352c94bef8192af9760ca720fb40ac674ea6eb