Bug 932919 landed on Friday and removed all of the border editing stuff from the image editor.  That would have created merge conflicts with this patch.  It appears that you resolved the merge conflicts for index.html, but did not resolve them correctly here because this patch brings all of the border CSS stuff back.