Build miq 5.0.4
Merge branch 'refs/heads/v504'