bug 860864 - further birch customizations. r=rail

--HG--
extra : rebase_source : 90e0af63e465f206b9b86b69d90d3a7289a976d9