Bug 932396 - implement "disable" action in slaveapi -- upgrade slaveapi on puppet to 1.1.1, r=callek
merge default -> production

--HG--
branch : production