Merge branch 'merged-superfile-delete' into wangkx-gh3070

Conflicts:
	esp/services/ws_dfu/ws_dfuService.cpp

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>