Merge branch 'develop' of github:ucb-ist-drupal/openberkeley-drops-7 into develop
OPENUCB-413 and 414: Fixes for test gremlins
Merge branch 'develop' of github:ucb-ist-drupal/openberkeley-drops-7 into 413-414
Merge pull request #93 from cboyden-ucb/413-414

OPENUCB 413 and 414: Fix tests