Fix improper keys in HOT templates

We've been doing stronger validation nowadays and several templates are
container upper-case keys that don't validate anymore. This patch fixes
them.

Change-Id: I791195104484fa17096d6b7833387ef2d3f9acc0
Merge "Fix improper keys in HOT templates"