Security update, some patches modified to apply correctly mostly due to
upstream changing indentation/styling

Tracked-On: EDISON-2531
Signed-off-by: chenchux <chunguangx.chen@intel.com>