This airport upgrading causing retrain issues is still causing me problems. My work around is to just retrain all planes, all other troops will the be available to retrain, expensive oil workaround, truly is an annoying expensive bug whilst trying to upgrade.