Merge branch 'jlh-expand-license' into 'master'

- Expand EE license use for development and testing

See merge request gitlab-org/gitlab-ee!2935

LICENSE

@@ -2,18 +2,24 @@ The GitLab Enterprise Edition (EE) license (the “EE License”)
 Copyright (c) 2011-2017 GitLab B.V.
 
 This software and associated documentation files (the "Software") may only be
-used if you (and any entity that you represent) have agreed to, and are in
-compliance with, the GitLab Subscription Terms of Service, available at
-https://about.gitlab.com/terms/#subscription (the “EE Terms”), and otherwise
-have a valid GitLab Enterprise Edition subscription for the correct number of
-user seats. Subject to the foregoing sentence, you are free to modify this
-Software and publish patches to the Software. You agree that GitLab and/or its
-licensors (as applicable) retain all right, title and interest in and to all
-Software incorporated in such modifications and/or patches, and all such
-Software may only be used, copied, modified, displayed, distributed, or
-otherwise exploited with a valid GitLab Enterprise Edition subscription for the
-correct number of user seats.  Subject to the foregoing, it is forbidden to
-copy, merge, publish, distribute, sublicense, and/or sell the Software.
+used in production, if you (and any entity that you represent) have agreed to, 
+and are in compliance with, the GitLab Subscription Terms of Service, available 
+at https://about.gitlab.com/terms/#subscription (the “EE Terms”), or other 
+agreement governing the use of the Software, as agreed by you and GitLab, 
+and otherwise have a valid GitLab Enterprise Edition subscription for the c
+orrect number of user seats. Subject to the foregoing sentence, you are free to 
+modify this Software and publish patches to the Software. You agree that GitLab 
+and/or its licensors (as applicable) retain all right, title and interest in and 
+to all such modifications and/or patches, and all such modifications and/or 
+patches may only be used, copied, modified, displayed, distributed, or otherwise 
+exploited with a valid GitLab Enterprise Edition subscription for the  correct 
+number of user seats.  Notwithstanding the foregoing, you may copy and modify 
+the Software for development and testing purposes, without requiring a 
+subscription.  You agree that GitLab and/or its licensors (as applicable) retain 
+all right, title and interest in and to all such modifications.  You are not 
+granted any other rights beyond what is expressly stated herein.  Subject to the 
+foregoing, it is forbidden to copy, merge, publish, distribute, sublicense, 
+and/or sell the Software.
 
 This EE License applies only to the part of this Software that is not
 distributed as part of GitLab Community Edition (CE), and that is not a file