issue 997308 - resume message now includes appropriate options
Merge branch 'issue997308-resume-with-provided-options' of https://github.com/sinemetu1/mozregression into sinemetu1-issue997308-resume-with-provided-options

Conflicts:
	mozregression/runnightly.py