Merge pull request #1 from rglen/master

Cleanup of container.xml.