Merge "Upgrade global-jjb to get login-shell flag in script"