[TIDOC-1382][TIDOC-1383][TIDOC-1384] Add disabledColor property and some other fixes
[TIDOC-1382] Update per comment
Merge pull request #5030 from bhatfield/tidoc-1382-3_2_X

[TIDOC-1382][TIDOC-1383][TIDOC-1384](3_2_X) Add disabledColor property and some other fixes