Etherpad
Nginx: Using upstream groups with a fallback for etherpad nodes
Removed double etherpad settings file
Using revision for ep_oae and etherpad-lite repos
Fix in etherpad settings
Reverted grouping of etherpad servers in nginx template.
Merge remote-tracking branch 'simong/etherpad2' into production

Conflicts:
	environments/performance/modules/localconfig/manifests/init.pp
	environments/production/modules/localconfig/manifests/init.pp