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