Merge branch 'fix-upstream-check' into 'master'

Fix upstream check

See merge request !194

run_validation.py

@@ -1044,7 +1044,7 @@ else:
     if arguments.devel:
         files_changed = filter_for_devel(files_changed)
 
-    if any(not os.path.relpath(file_path).startswith('v') for file_path in file_changed):
+    if any(not (file_path == '.gitattributes' or file_path.startswith('v')) for file_path in files_changed):
         raise ValidationError("There are non-primitive file changes between your branch and upstream. If you have not authored those changes, you need to update your branch with upstream.")