ACCUMULO-3419 Quote the colvis and increase ZK client timeout

Quote the column visibility so the shell doesn't try to interpret
the pipe character. Increase the ZK client timeout because a one
second timeout will repeatedly fail.
Merge branch '1.6'

Conflicts:
	examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TracingExample.java
ACCUMULO-3419 Fix testTrace in master

Not sure where the extra tracing example invocation
came from, but it's unnecessary. Just need to switch over
the test to account for the flipped application/host pair
from cloudtrace->htrace.
Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Merge branch '1.6'