Settling merge conflict in vdi/views.py to remove login functions.
Settling merge conflict in vdi/views.py to remove login functions.

ehelms/Opus,ehelms/Opus,ehelms/Opus,bmbouter/Opus,bmbouter/Opus,bmbouter/Opus