bug 991391 - b2g version 1.5 -> 2.0. r=rail
merge default -> production

--HG--
branch : production