fix isssues arising in merge of descfcn/iosys changes#540

sawyerbfuller merged 1 commit into

python-control:masterpython-control/python-control:masterfrom

murrayrm:fix_descfcn_iosys_mergemurrayrm/python-control:fix_descfcn_iosys_mergeCopy head branch name to clipboard