Bring templates up-to-date.
Merge pull request #147 from basho/csm-resolve-confirm-error

Bring templates up-to-date.