Updates to support latest python-pbr changes.