Merge branch 'feature/gearman'

Change-Id: I25b4b90b160c258094aa1f3f55a9e00ad0d0db79