Merge "fixes for supporting non-gui application access provisioning"