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>