Ensure that we don't merge broken json.#18288

rullzer merged 2 commits intomasternextcloud/server:masterfrom

bug/18277/catch-json-errorsnextcloud/server:bug/18277/catch-json-errorsCopy head branch name to clipboard