Merge "Basedir of a bundled app is added to the permitted paths" into pi-dev