Updated to latest upstream kibana. Fixed tests.