Normalizing buildout (Refs #9567)
Merge remote-tracking branch 'collective/master'