Merge resource features and resource
Update to Yaml encoder to trim whitespace
Coerce boolean values into strings so they can be matched against feature string values
Handle merging of branches