Extracting accidental master merge.
Further extraction of accidental merge from master.
Pass $user object as reference.
Add missing processBatch() method for D6, remove extra blank line.
Fix userCreate() method for D6.
Fix userDelete() method for D6.
Remove usage of user_role_load_by_name() function in D6 userAddRole().
$role is not an object in D6.
Fix roleCreate() method for D6.
Revert "Fix roleCreate() method for D6."

This reverts commit 4aab7a100b0a7cdb58cba0344eec54b2f2ca3caf.