Merge "Nopasswd for more commands at gbp-trusty"