Bug 999498: use lsbdistcodename instead of 'precise'; r=rail
Bug 938629: remove old 'puppet' and 'repos' from /etc/hosts; r=rail
Merge default -> production

--HG--
branch : production