Comment 1 for bug 1386087

Note that until a few days ago, we didn't validate this at all:

https://github.com/openstack/heat/commit/bbe47783b587c6da2ba1a86e332fbd37096005c4

So I guess we just need to add a little more validation in addition to what was implemented in that patch