Replaced yaml.dump/load with yamlutils versions

Just covering a few missed cases after the creation of
yamlutils. A side effect of yaml.dump was causing the client
to fail to parse the raw_content of a plan immediately after
creation.

Change-Id: I68a9559a85c4c29d7a443f998dc94b644f0eeb9e