FAB-14271 Add channel policies to channel config

Previously, configtxgen would auto-populate policies if they were
omitted.  This presented some problems for specifying partial policy
schemes, like only overriding one policy.  Support for omitting policies
was deprecated in v1.3 and has been removed for v2.0.0.

Change-Id: Ie01bf8f05911358a0af144f2fe2df2667c2bf12e
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>

first-network/configtx.yaml

@@ -314,6 +314,7 @@ Profiles:
  - *Org2
  TwoOrgsChannel:
  Consortium: SampleConsortium
+ <<: *ChannelDefaults
  Application:
  <<: *ApplicationDefaults
  Organizations:
@@ -345,4 +346,4 @@ Profiles:
  SampleConsortium:
  Organizations:
  - *Org1
- - *Org2
+ - *Org2