Update the heat template cherry pick revision

The revision 17 fixes a bug in swift-storage's default parameter.
Merge pull request #66 from tomassedovic/patch-3

Update the heat template cherry pick revision