Auto merge of #6259 - jgraham:more_css_expected_changes, r=Manishearth

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6259)
<!-- Reviewable:end -->

tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-height-014.htm.ini

@@ -1,4 +1,4 @@
-[absolute-replaced-height-028.htm]
+[absolute-replaced-height-014.htm]
   type: reftest
   expected:
     if (os == "mac") and (version == "OS X 10.8.5"): FAIL

tests/wpt/metadata-css/css21_dev/html4/absolute-replaced-height-021.htm.ini

@@ -0,0 +1,4 @@
+[absolute-replaced-height-021.htm]
+  type: reftest
+  expected:
+    if (os == "mac") and (version == "OS X 10.8.5"): FAIL

tests/wpt/metadata-css/css21_dev/html4/bidi-inline-002.htm.ini

@@ -1,3 +1,5 @@
 [bidi-inline-002.htm]
   type: reftest
-  expected: TIMEOUT
+  expected:
+    if not debug and (os == "linux") and (version == "Ubuntu 14.04") and (processor == "x86_64") and (bits == 64): FAIL
+    TIMEOUT

tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-023.htm.ini

@@ -1,3 +1,5 @@
 [inline-formatting-context-023.htm]
   type: reftest
-  expected: TIMEOUT
+  expected:
+    if not debug and (os == "linux") and (version == "Ubuntu 14.04") and (processor == "x86_64") and (bits == 64): FAIL
+    TIMEOUT

tests/wpt/metadata-css/css21_dev/html4/line-height-125.htm.ini

@@ -1,5 +1,4 @@
 [line-height-125.htm]
   type: reftest
   disabled: unstable
-  expected:
-    FAIL
+  expected: FAIL