Updated openstack/openstack
Project: openstack-dev/pbr  3250f69d1a15c4482deb281e39ed0cd4ac3550b5

Remove --use-mailmap as it's not needed

--use-mailmap is a newer git construct that applies mailmaps to
things that are not using the mailmap aware format strings. But
we're using those format strings, and this breaks on precise.

Simplest thing - don't use the arg, since it's pointless and broken
for us.

Change-Id: Ic8ca062a6936a4f112aa52d0eb209211658611c2
Updated openstack/openstack
Project: openstack/python-troveclient  d02764e597b331c0c692488477a9ce29045eb32a

Corrects trove-client output

Updates the condition to test global symbol 'json_output' and
print results accordingly.

Change-Id: Ib1d5d45413b4652456c05bda6304701b0ce23a06
Closes-Bug: #1322461