Fix for the Heft site selector, when no execution sites were passed on
the command line.
Merge branch '4.2'