Added PathModifier to tweak paths contain whitespaces
removed cherry-pick conflicts markers
Enabled pmaker.collectors.Filters.WhitespacesInPathFilter
Not cleanup test working dirs for debug (temporary)