Merge pull request #155 from dfcoffin/master

Issue # 141 - retailCustomerId is null for client_credentials based authorizations, Issue #149 - Validate ESPI scope strings