rgw-admin: fix user_id initialization

broken due to rebase

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
rgw-admin: fix some more merge issues

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>