Fix for issue #1505
Moving form validation into the datacollection display object inorder to increase flexibility in updates
Moving form validation into the datacollection display object inorder to increase flexibility in updates