Include map-players in the color validator.
Merge pull request #6512 from pchote/more-color-validation

Include map-players in the color validation checks.