3897671 Merge #60 `fix conditional deps (this can't be easily covered with unit tests; tested on huge package set using various in-place YUM hacks)`

Merged and Committed by dmach 8 years ago