fixes #5241 - Add support for external user groups.
fixes #5490 - ambiguous column in taxonomix pluck on Rails 3.2.8
fixes #5038 - remove empty label causing template edit box indentation
fixes #4612 show friendly CR names, fix typo in oVirt name
fixes #5427 - skip user roles FK removal if it's missing
Fixes #4287 - Join directly to template_combinations when resolving templates