* ISSUE #3530 add button for user role page * Merge branch 'upstream-develop' into develop-issues-#2792 # Conflicts: # console/src/main/resources/static/js/main.js