bug fix and adjust to work with ibm watson#8

raajon wants to merge 5 commits into

bhtz:masterbhtz/parse-server-swagger:masterfrom

raajon:masterraajon/parse-server-swagger:masterCopy head branch name to clipboard