ApexDoc class comments
yet another RD test fix!
Merge pull request #1202 from SalesforceFoundation/feature/1158-state-country-picklists

RD Test fix and ApexDoc comment headers
Merge dev into feature/1045-ref-cumulusci