Update heat.conf.sample

A new version of python-keystoneclient introduces an option,
include_service_catalog, so heat.conf.sample should be updated.

Closes-Bug: #1268614
Change-Id: I3caf012d1ecfd852b736f52a1269f742449ffee9
Use region for cinder management uri

Make the cinder client region-aware since Rackspace supports
more that one and needs to know in which region to deploy
volumes.

Closes-Bug: #1268706
Change-Id: Ibf7cf4fbabd1e11f798423b9ad2698e43cd46687