Fixes after rebase of modified upstream branch

* Fix for display.rs compute_vault_account_json that should not include wallet_type anymore (was removed from upstream branch)
* Also some changes from `cargo fmt`