Add lxc plugin

Signed-off-by: Chuck Short <chuck.short@canonical.com>
Add docker plugin

Signed-off-by: Chuck Short <chuck.short@canonical.com>
Merge branch 'master' of github.com:zulcss/nova

Signed-off-by: Chuck Short <chuck.short@canonical.com>

Conflicts:
	nova/virt/containers/lxc.py