Merge branch 'v1.0'

diff --combined BUILD.sh
index 58f9c3d,c732207..1f550d9
--- 1/BUILD.sh
--- 2/BUILD.sh
+++ b/BUILD.sh
@@@ -114,10 -114,10 +114,10 @@@ f
  
  if [[ $PLATFORM == ub16 ]]; then
      PLATFORM_REPOSITORY=${1:-OSM}
 -    PLATFORM_VERSION=${2:-4.3.1.0.50309}
 +    PLATFORM_VERSION=${2:-4.3.1.0.53651}
  elif [[ $PLATFORM == fc20 ]]; then
      PLATFORM_REPOSITORY=${1:-OSM}  # change to OSM when published
 -    PLATFORM_VERSION=${2:-4.3.1.0.50310}
 +    PLATFORM_VERSION=${2:-4.3.1.0.53651}
  else
      echo "Internal error: unknown platform $PLATFORM"
      exit 1
@@@ -147,6 -147,9 +147,9 @@@ test -h /usr/rift && sudo rm -f /usr/ri
  if [[ $PLATFORM == ub16 ]]; then
      # enable the right repos
      curl http://repos.riftio.com/public/xenial-riftware-public-key | sudo apt-key add -
+     # the old mkcontainer always enabled release which can be bad
+     # so remove it
+     sudo rm -f /etc/apt/sources.list.d/release
      sudo curl -o /etc/apt/sources.list.d/${PLATFORM_REPOSITORY}.list http://buildtracker.riftio.com/repo_file/ub16/${PLATFORM_REPOSITORY}/ 
      sudo apt-get update
          
@@@ -185,8 -188,6 +188,8 @@@ if [[ $PLATFORM == ub16 ]]; the
         rw.core.rwvx-rwdts=${PLATFORM_VERSION} \
         rw.automation.core-RWAUTO=${PLATFORM_VERSION} \
           rw.core.rwvx-rwha-1.0=${PLATFORM_VERSION}
 +
 +    sudo apt-get install python-cinderclient
      
      sudo chmod 777 /usr/rift /usr/rift/usr/share