Merge back in old config scheme for backwards compatibility

This will allow either style of parameters and application config to be
used for the metadata management application, so that these changes can
be rolled out in stages: (1) update puppet, (2) update hiera data, (3)
update apps, (4) remove old config scheme puppet code and hiera data. #4
can be done for puppet code simply by reverting this commit.