Update to PBR 0.5.21+

Change-Id: Icb0754f9d64ea2b4d561866c8c5f614316217a1b