Make some updates to go along with Foreman 1.4 -> 1.5 upgrade