Added the maven-assembly plugin to the daemon build
Merge remote-tracking branch 'origin/master'