Make the heat template work with nova-network

The current template assumes that neutron is used, this patch updates it
to work with both nova-net and neutron.

Change-Id: I98a1b9956be62e07f0b931d956a8f546248addfe
Closes-Bug: #1308359
Fix formatting of Cinder database creation

Changed to match the formatting of other database creation steps
in the guide, which put multiple commands inside a single
<screen> tag.

Change-Id: I4a76f69a2ba156c249cecdd9e250767921b91dc5
Closes-Bug: #1308380
Merge "Fix formatting of Cinder database creation"