fix token mail not working with custom Controller config + fix tests failing with latest cake#1126

steinkel merged 3 commits intoCakeDC:15.next-cake5CakeDC/users:15.next-cake5from

LordSimal:15.next-cake5LordSimal/cakedc-users:15.next-cake5Copy head branch name to clipboard