Bug 873251 - Fix botched backout and reland. a=typo
Bug 874599 - Only call _deleteSession during cleanTest, r=mdas