Sync with upstream for Foreman 1.3.0 release