Merge changes I3f2ffef2,I1dabc312

* changes:
  [so][msb] Update MSB url to match with its certificate
  Set certificate SAN as msb-iag