Updated openstack/openstack
Project: openstack/heat  22fb1e04ee5130639942bd3da65b1761c407f84b

Add is_conflict() to client plugins

Change-Id: I0f4239869da8cab505723ff6b2dfbb37bef83ff1