Combine etcd and stmonleader

This commit gets rid of the etcd role to
allow excess memory so that we can bump
up memory on ocdb.

the overall aim of this commit is to
reduce the overall clock time for
installation.

it adds etcd to stmonleader b/c that is
the role that needs to install first
before other services can start.