Bump versions post merge. a=merges CLOSED TREE