Adding data mapping for custom user fields
MDL-16982 Administration: Cleaned whitespaces and alignment in orignal patch
MDL-16982 Administration: Integrated Inaki's suggestions