Merge branch 'branch-out-of-date-message' into 'master'

Check non-primitive files match upstream

Closes #339

See merge request !190

run_validation.py

@@ -1044,6 +1044,9 @@ 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):
+        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.")
+
 
 error_count = 0
 installations = collections.defaultdict(list)