Fix #1098: Configuration system does not permit identifiers to be one character in length (good thing we have a simpleType for it!)
merge 0bf71941307b85631604664777b8bbcea80032de...32987209a167915d44a6cc5ceaf275182dadb157 (from 1.0)
merge 32987209a167915d44a6cc5ceaf275182dadb157...62b24de0c3677bc88d7db49c3db0ff3dd78b9a52 (from master)