Condition and Observation without CCD

Condition and Observation without CCD. Terminology lookup not
implemented
More additions to Resource Providers
Merge remote-tracking branch 'upstream/master'

merging