* client: cleanup redundant semicolon warnings * grandpa: remove usage of deprecated compare_and_swap