Decreased polling time for the scheduler (10min -> 2 min), should help with #335
Merge branch 'master' of https://github.com/appsgate2015/appsgate