Merge branch 'stable-2.16' into master

* stable-2.16:
  Fix setting email for service user

Change-Id: Ia7adb72b737899c674eae0f107e5605113495546