Merge "Increasing neutron timeout for low memory usage"