Remove unused versions define in template_format.py

Remove unused 'HEAT_VERSIONS' and 'CFN_VERSIONS' define in
template_format.py.

Change-Id: Icb6920fa481259868b6bf2feaab9859a13c59467
Fix typo in HOT spec

This patch fixes a simple typo in hot_spec.rst which was introduced
in a recent patch.

Change-Id: I62bfac04a46b39bc53320c00ecb9a8b9623975fe
Merge "Fix typo in HOT spec"
Merge "Remove unused versions define in template_format.py"