Renames container2 back to simply container to make updating to 2.2.0 less apt to require a custom theme update [#1000 state:resolved]