CFY-972 modified imports of system tests blueprints to 3.1/1.1 versions of types.yaml/plugins after DSL changes; added types.yaml dependencies to blueprints as plugins don't come with it out of the box anymore