sort access tokens when returning a description of them
sort and format
fix unit test failure
Merge remote-tracking branch 'upstream/develop' into develop