All rights, privileges and property affected by an executed part of a court-martial sentence which has been set aside or disapproved, except an executed dismissal or discharge, shall be restored unless a new trial or rehearing is ordered and that executed part is included in a sentence imposed upon the new trial or rehearing.