Bug 863013 - Add thimble/external types for contentType in Make Schema.

Update fake test data accordingly