Fixes #3468 - Move token expiry to scope to avoid FK issues
fixes #3669 - migration: minimize amount of User model exposed to migration
fixes #3672: Add in the zanata.xml file for pushing strings to zanata.
Merge branch 'develop' of ssh://github.com/theforeman/foreman into develop