Merge change I6b350185 into eclair

* changes:
  Add a cleanspec rule for the change to bump the API version to 5.