Gardening. Skipped some failing htpp tests that still fail after unskipping,
and skipped failing editing tests after r151140.