Add flatAppend and flatConcat methods to codec
Add target type to the Discriminator type; add demonstration of fixing subtype
Merge branch 'master' into topic/shapeless-2.1
Fix build issues due to Shapeless upgrade