Fixed mock expects on ThresholdingVisitorTest.
Removed CollectdPackage convenience class. Moved some of its methods down
into the Package class and moved some methods up into the CollectdConfig.