German govt agrees solution to spymaster crisis that threatened coalition