Merge "Fix Shiro sonar job name"