Avoid errors if plugin directory doesn't exist
Switch behat to use 'progress' format on travis build
Update media module to fix error in routing
Merge commit 'ad2bb26' into settings-ui
Fix PLUGINPATH handling when plugins/ directory doesn't exist.

Make sure we don't define PLUGINPATH as /. This causes mayhem and breaks
things.