updating to latest m2 and sample data versions