-Werror=shadow

Change-Id: I6160150950d981a01b49cfc4c740683c1fd89b8e
(cherry picked from commit aa6fe2a0e62bdde897697c4e254d4256ff2accde)
Signed-off-by: Michael Stahl <mstahl@redhat.com>