Merge change 10974 into cupcake

* changes:
  Alpha-sort lists of proprietary files