admin yaml convert oxygen and snapshot*

this still leaves behind 'include sudo::appserver' which
will require more thought and coordination.

Change-Id: Ifc6fb10810023d52487a0fea9f7bba86cd725afe