Make trust option flags consistent.
OpenSSH as a cmdb by including authorized_keys.

Also make cmdb options consistent.