Yaml file format changes.

First pass at cleaning up the yaml files here.  I believe that this is
an improvement, but this code is not ready for prime time.  The
4-workload directory changes cause two workload sections, which I
think breaks things.  The format changes made to
3-emperor-upgrade/emperor.yaml and to
6-final-workload/rados_loadgenmix.yaml feel odd in that the are
indented to dovetail with previous portions of the yaml files.  I put
together a manual test case, and assertions early in the upgrade suite
still fail, even when the portion generated by the 4-workload directory
is removed.  I am pushing this so that others can take a look.