Merge branch 'stable-3.6' into stable-3.7

* stable-3.6:
  Bump up globabl-refdb to 3.6.3.4
  Bump up global-refdb to 3.5.4.3

Change-Id: Ibf43f781eb0f6bfb144dfed8931e47dde4646b61