2173-subs-json - include accountNumber and productId
Merge pull request #2195 from thomasmckay/2173-subs-json

2173-subs-json - include accountNumber and productId