am 8ea254a8: (-s ours) Allow authority to be set from build configuration - DO NOT MERGE

* commit '8ea254a8c615f4a68d3a7afed578cc8ff8fb92ca':
  Allow authority to be set from build configuration - DO NOT MERGE