Merge branch 'stable-3.4'

* stable-3.4:
  Use null instead of "N/A" as default change-number
  RMQ: Follow new sepia standard for routing-key

Change-Id: I33c6e869e6658c2effa38b4f97ec11e256bd1e45