Enhance filteredJson to clean up JSON strings. * Simplify test code in IncludeIT and future ConfigIT. Change-Id: Idf0dfde91c468e795e4be0b7d44fa95516ee6708