Applied apache patch before START_ALL_SERVICES, updated TODO.