[[ Bug 11917 ]] Make setting the label of an option menu or combobox att...

Given this has a very slight change in behavior it is suitable for develop, not maintenance release.