metomi/rose#884: standardise shell help
rose edit: trap upgrade macro errors
Merge pull request #1056 from benfitzpatrick/rose-edit.trap-upgrade-macro-exceptions

rose edit: trap upgrade macro errors
metomi/rose#884: prototype bash completion
metomi/rose#884: test-battery in progress
metomi/rose#884: test-battery fixes
metomi/rose#884: pass test-battery
metomi/rose#884: tidy up code
metomi/rose#884: rename files
metomi/rose#884: tidy and rename
Merge branch 'master' into 884.rose-cli-bash-tab-completion
metomi/rose#884: remove debug line
metomi/rose#884: implement feedback
metomi/rose#884: fix instructions
metomi/rose#884: undo sub-shell/array COMPREPLY change
metomi/rose#884: fix instructions, again
metomi/rose#884: support bin/rose
metomi/rose#884: bin/rose: allow tilde, env variables
metomi/rose#884: allow local test-battery change
t/rose-suite-hook/00: fix instability

`sleep 600` is still attached to some devices which causes an NFS
resource busy problem on suite clean.