CFY-1049 riemann init script fixes