am 272aeb58: (-s ours) am 78fec02f: (-s ours) Allow authority to be set from...
Justin Klaassen authored
am 272aeb58: (-s ours) am 78fec02f: (-s ours) Allow authority to be set from build configuration - DO NOT MERGE

* commit '272aeb58':
  Allow authority to be set from build configuration - DO NOT MERGE
f5d10f63