Bug 792836: manage slave and master secrets; r=Callek