Make sure plan.raw_content is populated

Before this patch all the content was filtered out.
Also raw_content is now json and not a string, so we shouldn't
be doing json.loads/dumps.

Change-Id: Ia2ab2a4e14f56de095b3b56dd4869f879404865a