Bug 875599 - Delete dead code in tools repo; this required a puppet change to remove symlinks to files in tools repo no longer present.r=Callek
Bug 967705: upgrade buildapi + dependencies; r=rail
Merge default -> production

--HG--
branch : production