take over changes for utopic from ubuntu but keep the atomic patch