Try harder to handle app bundles with space in name. (Not sure if this
version yet does that 100%.)

Include the directory names in the "ids" to make them unique. There
are lots of files with the same name (in different directories, of
course), especially in an app bundle that includes help in multiple
languages.

Change-Id: I424c539f6389ac6f7c9cef96aeb873ddac459f78