Fix #1011: Configuration system does not permit identifiers to be one character in length (good thing we have a simpleType for it!)
merge bfa367b085ec60a3c4799e319f4ba3f74ee8213f to eff8aad0fafe882c8adc79c2adad93e12d0225b2 (from 1.0)
merge eff8aad0fafe882c8adc79c2adad93e12d0225b2 to d4f731a5a5a7124c97aea1aa5bb67ab4c3ab0286 (from master)