uploader - add step entries for png, jpg
(cherry picked from commit e669a47538de477373b59636f772d83db067a957)
fix bad check in json_response
(cherry picked from commit 97bc882fb646364f84c9d33d99ff3a9bc4248b8d)