Recheckin of fixes to app-ready and waiting for web-socket server to be up.