Resolve conflicts with 2 branch

Author: GeoffreyBooth

test/error_messages.coffee

@@ -1155,7 +1155,7 @@ test "imported members cannot be reassigned", ->
            ^^^
   '''
 
-test "CS only keywords can't be used as unaliased names in import lists", ->
+test "CoffeeScript keywords cannot be used as unaliased names in import lists", ->
   assertErrorFormat """
     import { unless, baz as bar } from 'lib'
     bar.barMethod()
@@ -1165,7 +1165,7 @@ test "CS only keywords can't be used as unaliased names in import lists", ->
              ^^^^^^
   '''
 
-test "CS only keywords can't be used as local names in import list aliases", ->
+test "CoffeeScript keywords cannot be used as local names in import list aliases", ->
   assertErrorFormat """
     import { bar as unless, baz as bar } from 'lib'
     bar.barMethod()

test/modules.coffee

@@ -510,15 +510,15 @@ test "export as aliases members imported from another module", ->
     } from 'lib';"""
   eq toJS(input), output
 
-test "export list can contain CS only keywords", ->
+test "export list can contain CoffeeScript keywords", ->
   input = "export { unless } from 'lib'"
   output = """
     export {
       unless
     } from 'lib';"""
   eq toJS(input), output
 
-test "export list can contain CS only keywords when aliasing", ->
+test "export list can contain CoffeeScript keywords when aliasing", ->
   input = "export { when as bar, baz as unless } from 'lib'"
   output = """
     export {
@@ -625,7 +625,7 @@ test "`as` can be used as an alias name", ->
     } from 'lib';"""
   eq toJS(input), output
 
-test "CS only keywords can be used as imported names in import lists", ->
+test "CoffeeScript keywords can be used as imported names in import lists", ->
   input = """
     import { unless as bar } from 'lib'
     bar.barMethod()"""