Merge branch 'scheduled-executor-timer' of github.com:recampbell/jenkins into recampbell-scheduled-executor-timer