core-5477 fix metadata validation logic
Merge branch 'dev' of github.com:iPlantCollaborativeOpenSource/DiscoveryEnvironment into dev