RhodeCode CE/EE

Main objective was to merge back the different streams of work and get ready for our normal process again.

"Issues overview":https://bugs.rhodecode.com/projects/rhodecode-3-0/issues?c[]=tracker&c[]=status&c[]=priority&c[]=subject&c[]=assigned_to&c[]=updated_on&f[]=fixed_version_id&f[]=&group_by=priority&op[fixed_version_id]=%3D&set_filter=1&sort=status%3Adesc%2Cparent%2Cid&utf8=%E2%9C%93&v[fixed_version_id][]=16