Merge "Putting groupbasedpolicy-ui-bundle on a diet"