Merge pull request #2474 from newrelic/andrew/data-source-keywords

Merge pull request #2474 from newrelic/andrew/data-source-keywords #1590