Deal in Content rather than Trail in scala code
Fix FaciaTestData to deal with Content instead of Trail
Merge branch 'trail-to-content'