CE Upstream - Wednesday
Resolved conflicts:
UU app/assets/javascripts/environments/components/environment.js
UU app/assets/javascripts/environments/components/environment_item.js
UU app/assets/javascripts/environments/components/environments_table.js
UU app/assets/javascripts/environments/stores/environments_store.js
UU app/assets/javascripts/main.js
UU app/assets/stylesheets/pages/boards.scss
UU spec/javascripts/environments/environment_spec.js
UU spec/javascripts/environments/environments_store_spec.js