Fix comment to match code
Bug 688623 - use correct set of standard collection names; r=telliott
Bump version number
Added tag rpm-1.17-1 for changeset 2e415ac1e4da
Bug 886674 - migrate loadtest scripts from funkload to loads