Validation of allowed values and benchmark syntax (Fixes BUGZ-4035)
Begin arcbot message
This merge request is automatically copied from !1326 (merged) orginally made by @dcameron
End arcbot message
Begin arcbot message
This merge request is automatically copied from !1326 (merged) orginally made by @dcameron
End arcbot message