MDL-29318 core: Fixes for get_complete_user_data()