The merge has been committed and the command line and eclipse builds are working(provided the admin-console project is excluded from eclipse. This project should be removed).
The server minimal boots fine and default looks to have only the expected failures. Report any issues.