Update PBR to 0.5.21

Change-Id: I5e8602485d28ee8c9326b4f19ed9bf4e4f9efa7a