Merge pull request #210 from poupotte/master

Update controller token recovery (for new controller)
increase timeout for alarm tests