Note: this JIRA assumes https://github.com/wildfly/wildfly-core/pull/6308 or something much the same is merged.

The HostControllerBootstrap and EmbeddedHostControllerBootstrap do very similar things, just with slightly different APIs and settings. Look into consolidating the logic. Perhaps an abstract base class the provide a protected variant of the embedded method:

protected Future<ServiceContainer> bootstrap(ServiceActivator... extraServices) throws Exception { 

The embedded one just makes that public; the non-embedded calls it from its method. Each defines the value of the 'embedded' param passed to the ControlledProcessState constructor.

Note: I may have missed something further; don't assume ^^^ fully defines the solution.