sync with Context; handle broken ps names

Broken name handling similar to http://repo.or.cz/w/context.git/commitdiff/8c7fab57c5fd2db6b9ade5f7608add9f650c8460 but not quite ready yet.