Issue #1871758 by jgraham: Fixed Extraneous diffs created on og features exports due to arbitrary role ordering.
