Change remaining references in the doc subdir

* "_savanna_" properties changed in json output

Change-Id: Ief26d2fb496e13c91aa72f7ce6184ad6a2c78065
Merge "Change remaining references in the doc subdir"