XXX: HYDRA PICKUP, DO NOT MERGE!

 * update userns patch for version 36 and higher...