Merge "add option --user to Bmgr.java"