Fix intermittent image upload modal failures

ref #1702
-wait for logo upload modal to go away before beginning test
 for cover upload modal
Merge pull request #2733 from jaswilli/test-error

Fix intermittent image upload modal failures