Bug 22128: Use DROP USER IF EXISTS instead of GRANT USAGE before DROP USAGE