Drop a patch that has been merged and include another that was
accidently left off during the last upgrade.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
python2 is EOL, so switch shebang to python3
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>