Title:Handling Autocomplete with Labels
@bug W-1867175,W-1876816@
@rev jmooney@
Merging origin/rshah/master-pending-autocompleteWithLabelFix into master