Normalizing buildout (Refs #9567)