* Fixed merge conflicts

* merge conflict errors

* left a space

* fix review comments by Janos

* few more comments fix

* handle no content-length in multipart part bzzFileUploadHandler (#296)

* remove some redundant checks
Co-authored-by: Janoš Guljaš <janos@users.noreply.github.com>