Ubuntu initscript uses $BEANSTALKD_EXTRA for setting extra deamon opts, not $DAEMON_OPTS
Made change backwards compatible
Merge branch 'raoulwissink-master'
version bump