[202012] Fix for "orchagent crashed when trying to delete fdb static entry with swssconfig #11046"#2374

prsunny merged 2 commits intosonic-net:202012sonic-net/sonic-swss:202012from

anilkpan:202012Copy head branch name to clipboard