Bug 877884 - fix order of columns in primary key; r=telliott