Merge pull request dart-lang/package_config#13 from dart-lang/normalize_rollbacks

Normalize rollbacks.