Add dependencies for some things we have always needed.
Merge bug26040
stable to default