ACCUMULO-3223 Explicitly handle null from getOnlineTabletsForTable
Merge branch '1.5' into 1.6
Merge branch '1.6'