Merge pull request #80 from vmendez/master

BUGFIX in nova, do not use vmdiracid as id at VM side
Merge pull request #81 from vmendez/master

BUGFIX: Endpoint should be shown in browse instances
Change to VMBES
Add userpassword auth for rocci
chown /opt/dirac
chown /opt/dirac
Change chown place
recover to the last commit
Change to default-VMBES
Add localsite architecture
Merge remote-tracking branch 'vmendez/master' into integration

Conflicts:
	WorkloadManagementSystem/private/bootstrap/general-DIRAC-context.sh
delete chown line
Merge remote-tracking branch 'njutiger/integration' into cloudinit
Merge remote branch 'origin'; https://github.com/njutiger/VMDIRAC into cloudinit

* origin:

* https://github.com/njutiger/VMDIRAC:
  delete chown line
  Add localsite architecture
  Change to default-VMBES
  recover to the last commit
  Change chown place
  chown /opt/dirac
  chown /opt/dirac
  Add userpassword auth for rocci
  Change to VMBES
general-DIRAC-context.sh is for VMDIRAC global default, user a copy of this for your own VMBES or whatever other global default