Bug 984677 - Back out bookmark submenu. r=mfinkle

--HG--
extra : rebase_source : 7ff1fa41da1fe32e63f57141040cf172486996b7