merge minor fixes from 4.0.x

git-svn-id: svn+ssh://svn.code.sf.net/p/gramps/code/trunk@21908 4ae1f11a-8b86-4847-b8af-ab372f36d1fd