sort access tokens when returning a description of them
sort and format
fix unit test failure
CON-188. Add LIKE and NOT_LIKE operators as aliases to REGEX and
NOT_REGEX
Merge remote-tracking branch 'upstream/develop' into develop