Bug 997006 - rename text-combine-horizontal to text-combine-upright. r=dholbert