- we order the traits by key in all the backends except sql. this keeps sql inline. - this reverts a patch to sort traits post query in test. Change-Id: I17009bdb01106dc07659a9198da2090ec63bcf51 Closes-Bug: #1423714