Comment 5 for bug 1404360

Reviewed: https://review.openstack.org/146836
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=c340a2b79bed32e5533c5c55e969250c6c90e8e0
Submitter: Jenkins
Branch: master

commit c340a2b79bed32e5533c5c55e969250c6c90e8e0
Author: Thomas Spatzier <email address hidden>
Date: Tue Jan 13 13:05:47 2015 +0100

    Fix template version in composition section

    The composition section uses some example templates that only work
    correctly with the latest heat_template_version 2014-10-16 as has
    been pointed out in a comment on review
    https://review.openstack.org/#/c/146454

    This change simply pulls all changes from the review mentioned
    above to the composition section in the heat repository.

    Change-Id: I2fcc64f80e1f5a1109ba31edec92912e8e55830d
    Partial-Bug: #1404360