Backed out changeset 03b50ae14f9b (bug 927398) for M-oth failures

Backed out from a CLOSED TREE
Backed out changeset 5349c5c0d9f8 (bug 924971) for M-oth failures

Backed out from a CLOSED TREE
Automatic merge