Updated openstack/openstack
Project: openstack/trove  ff4ee2ce97bb1fc6e29321be0d2ceccb780c1c0d
null
Cleans and improves heat code path

Reasons:
- Heat code path contains cinder code.
- Heat code path contains nova code.
- Heat template is frozen with Volume support,
  it cannot act in a volume disabled environment.

Changes:
- Adds conditional Volume support in heat.template.
- Adds conditional template rendering.
- Cleans nova code from heat code path.
- Cleans cinder code from heat code path.

Change-Id: I7e4d6edf8bb11de0bcf913a58b257c625468322c
Closes-Bug: #1262378
Updated openstack/openstack
Project: openstack/trove  64c00dd540ca13ee6fa7692152074a78562542d5
null
Adds Missing _() for Exception Message Translation

Reasons:
- Exception messages missing underscores. This is necessary to
  mark messages as ready for translation, and is already the
  defacto standard across the trove codebase,as per,
  https://wiki.openstack.org/wiki/Translations
- Because of incorrect Exception messages, it does not overrides
  the default message of BadRequest.

Changes:
- Adds the missing underscore function to wrap a few user-facing
  exception messages.

Change-Id: Ib4a183f717146493e514b8169679a57cc2ecfd01
Closes-Bug: #1264688