graceful handling of application:which_applications() timeout
merge bug25571 into stable
merge stable into default