Merge mozilla-central to autoland a=merge on a CLOSED TREE