Merge pull request #577 from johncowie/master

[#1875] John/Kavitha - Added test for malformed json handling and improv...
[#8164] Kavitha/John - Enquiries API can now return all enquiries and enquiry by ID.
John - Child API now returns empty body (not 'null') with 404 if child record is not found.
Merge remote-tracking branch 'upstream/master'