#4884: Fix bodhi buildroot overrides