Bug 1106577: add masters to known hosts; r=Callek
Merge default -> production