... and move the services into the deployment directory.
The extraconfig/services directory was initially created for
experimental services using an interface that was work in progress but
is now stable enough, so the services can live among the others for
simplification.
Change-Id: I2bd0b169ed18ea2fccfea4475402dd73076924c8
2f3554cdcb