Merge "Fix apache response time casting from us to s"