Merge remote-tracking branch 'upstream/master' into roles

No conflicts. 

Mainly desired because of the fix for http://projects.theforeman.org/issues/5093