Add missing parameter
Updated instructions
New buildout
\#nosaenteraonadie
Update Osiris configuration templates and base conf
Merge branch 'master' of github.com:UPCnet/maxserver
Fix version pin name
Updated versions
Fixed versions
Update deplyment versions
Update versions
Update versions
Fix versions
Merge branch 'master' of github.com:UPCnet/maxserver

Conflicts:
	config/ldap.ini
	versions.cfg
Update jenkins build