#FTE-153, Fix get email address to username on system.
Merge branch 'master' of https://github.com/qiang2liu/drupal_dev_demo