Bug 850842 - Make the watchpoint map safe for moving GC; r=billm

--HG--
extra : rebase_source : 6299ee5c5b164b428c3c7e02e03bc204ba5d572b