More accurate margin collapsing
auto merge of #903 : ILyoan/servo/margin_collapse_fix, r=metajack