Fix pgrep usage

For cylc/cylc#1166.
* Need a slightly improved `pgrep` pattern to avoid matching the new `cylc job-submit` commands.
* The `fcm_make` built-in application change is harmless (and in some way nicer), but it was done to fix an odd behaviour when running this under background jobs in earlier versions of my change for cylc/cylc#1166.