Merge branch '3822-ensure-unique-names' refs #3822

Conflicts:
	services/api/Gemfile
	services/api/Gemfile.lock

diff --cc services/api/Gemfile
index fb8f43e89c15c7c4e8d80957c105605fa0445bca,32a2fbd0b1abbe494a5af7fa3cc48159b43ef464..cd7842cae94431db06629f8565ed2c91b4dfc6c1
--- 1/services/api/Gemfile
--- 2/services/api/Gemfile
+++ b/services/api/Gemfile
@@@ -71,8 -71,7 +71,8 @@@ gem 'database_cleaner
  
  gem 'themes_for_rails'
  
- gem 'arvados', '>= 0.1.20140905115707'
- gem 'arvados-cli', '>= 0.1.20140905115707'
 -gem 'arvados-cli', '>= 0.1.20140905164626'
++gem 'arvados', '>= 0.1.20140905131846'
++gem 'arvados-cli', '>= 0.1.20140905131846'
  
  # pg_power lets us use partial indexes in schema.rb in Rails 3
  gem 'pg_power'

diff --cc services/api/Gemfile.lock
index 6d519488a619a91403d31502c30a9e2494f8a6f8,3c711fc32f2bc092ae3d01ecb7293fef17099c63..13c0578aa251f34ab8476a9ac87d3ee9460f83a0
--- 1/services/api/Gemfile.lock
--- 2/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@@ -35,7 -35,7 +35,7 @@@ GE
      addressable (2.3.6)
      andand (1.3.3)
      arel (3.0.3)
-     arvados (0.1.20140905115707)
 -    arvados (0.1.20140827170424)
++    arvados (0.1.20140905131846)
        activesupport (>= 3.2.13)
        andand
        google-api-client (~> 0.6.3)
@@@ -223,8 -223,7 +223,8 @@@ PLATFORM
  DEPENDENCIES
    acts_as_api
    andand
-   arvados (>= 0.1.20140905115707)
-   arvados-cli (>= 0.1.20140905115707)
 -  arvados-cli (>= 0.1.20140905164626)
++  arvados (>= 0.1.20140905131846)
++  arvados-cli (>= 0.1.20140905131846)
    coffee-rails (~> 3.2.0)
    database_cleaner
    factory_girl_rails

diff --cc services/api/test/functional/arvados/v1/collections_controller_test.rb
Simple merge