core-5380 core-5381 fix preferences defaults values
Merge branch 'dev' of github.com:iPlantCollaborativeOpenSource/DiscoveryEnvironment into dev