These were missed when the puppet4 support was added. Change-Id: I7f7153093aaf46d5bbdb620228cf1c7fce3650e1