Merge change 5082

* changes:
  pass correct -s and -m options to release tools