Merged changes from motor-ramp-testing to ramp motor speed