FREEPBX-5926 #close fix tooltip defaults to match what we actually set. Also clean up duplicate definitions of the same tooltip
Merge branch 'release/2.11' into develop