Fix a comment in the tests
Revert "Always add dependencies of a package, even if the strictness is 3"

This reverts commit 3077dc15d2da7b33b512ad087181bd96e98f6b10.

This causes some serious performance regressions in some cases (conda create
-n anaconda python=2.7 numpy=1.6 takes 1:30 before this change and 7:30
after).
Remove reverted change from CHANGELOG
Merge branch 'master' of github.com:conda/conda