Bug 1004716 - Adjust marker timestamps when merging profiles. r=ehsan DONTBUILD because NPOTB

--HG--
extra : rebase_source : 446f59d60e1508a9d05b7e55f2793ba6556e09ad