Merge proposals dependent on lp://staging/~amanica/bzr/supports_executable-detect-based-on-fs-240294

1. supports_executable-detect-based-on-fs-240294
2. Dependent merge proposals