Added mock to requirements
Remove custom mock install now that it's in requirements.txt
Merge branch 'kz9676-fix-missing-mock-requirement' into develop.

Add missing dependency to requirements.txt. Fixes #2494.