MB-8316: Revise help messages

Change-Id: I871e29b9745e790c73ccd31fe3f965fa2943d6a0