Is there a way to prevent access to EJBs during server startup?

Issue

• EAP allows calls to other EJBs before a @Startup @Singleton finishes its @PostConstruct call.
• Currently we have a problem that EJBs get called as soon as they are deployed although the application is not completely up, yet.
  In EAP 5 we had a configuration in jboss-service.xml that bound the naming service to a .war file that triggered our application startup like this:

     <!-- This is to ensure that the server is only accesible (via JNDI) after setup of
         the complete application. Naming should only start after 21C-application has finished its deployment. -->    
     <depends>jboss.web.deployment:war=/framework_setup</depends>

Is there some mechanism in EAP 6 to prevent access to EAP services during application deployment?