USS Boxer CV-21, CVA-21, CVS-21