Deduplicate distrib-dirs logic from r289086 in distribution.
Sponsored by: EMC / Isilon Storage Division