OS-2502 illumos-joyent manifest should be sorted
Merge branch 'master' of git://github.com/joyent/illumos-joyent into smartos/ec