ACCUMULO-2549 Fixes ShellTest

Authorizations were coming back from getauths in an unexpected
order.  This patch changes the test to expect not a specific
string a but a list of expected authorization entries.

Signed-off-by: Mike Drob <mdrob@cloudera.com>
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
Merge branch '1.6.1-SNAPSHOT'