3.x removes api key suppport
Prior to merging, this change requires the work in this MR to be merged into the 2.x branch, and then the 2.x branch be merged into 3.x.
Edited by Andy Price
Prior to merging, this change requires the work in this MR to be merged into the 2.x branch, and then the 2.x branch be merged into 3.x.