merge changes from opencloud.dp on demo
merge changes from opencloud.dp on demo

jermowery/xos,wathsalav/xos,wathsalav/xos,opencord/xos,xmaruto/mcord,xmaruto/mcord,wathsalav/xos,zdw/xos,cboling/xos,wathsalav/xos,cboling/xos,cboling/xos,opencord/xos,zdw/xos,jermowery/xos,cboling/xos,zdw/xos,xmaruto/mcord,zdw/xos,jermowery/xos,opencord/xos,xmaruto/mcord,open-cloud/xos,open-cloud/xos,jermowery/xos,open-cloud/xos,cboling/xos