Creating environment for testing Bug 1034884

Conflicts:
	Gemfile.lock