[Merge] ~rafaeldtinoco/ubuntu/+source/samba:lp1831381-disco-devel-ctdb into ubuntu/+source/samba:ubuntu/disco-devel

[Rafael David Tinoco]

Alright, I'll drop the syslog change, makes sense. Will push the changes in a bit

-- 
https://code.launchpad.net/~rafaeldtinoco/ubuntu/+source/samba/+git/samba/+merge/370016
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~rafaeldtinoco/ubuntu/+source/samba:lp1831381-disco-devel-ctdb into ubuntu/+source/samba:ubuntu/disco-devel.