Merge "Document choices using oslo.config interface"