Merge "Add option to ApiFormatRaw to generate a HTTP errorcode"