Updated openstack/openstack
Project: openstack/heat  5e7344b2e3550f4472d64433daed943a4db1673f
null
Ensure parameter timeout_mins available in update

The parameter timeout_mins is not available when
updating a stack. The updater gets it from the
old stack no matter whether timeout_mins is
offered or not.

If timeout_mins is not offered in the new stack,
get the timeout from the old stack, and update
this parameter using the new stack's timeout.

Change-Id: I7d04d0f0b7cc917d49d45c0d3e1d5a8ffb7bff0b
Closes-Bug: 1290603
Updated openstack/openstack
Project: openstack/trove  11369595c0cce5e8f2f6de05330d0cf9c7178b01
null
Pop instead of get for timeout kwarg

In utils.py execute_with_timeout() method was updated
to do kwargs.pop() instead of kwargs.get()

Closes-Bug: #1292692
Change-Id: Id69e66f5e312a2bd2501bae18ddd050dd4296ff5