Updates tripleo-heat-template cherry-picks

This patch updates the heat-templates for tuskar usage to the latest
refs and adds a cherry-pick for adding ExtraConfig to storage
templates.