Change some imports to fit OrientDB 2.0-M2