Merge branch 'v1.0'

diff --combined BUILD.sh
index ec01675,2d5b053..58f9c3d
--- 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
@@@ -171,7 -171,7 +171,7 @@@ f
  if $runMkcontainer; then
      sudo apt-get install -y libxml2-dev libxslt-dev
      sudo /usr/rift/container_tools/mkcontainer --modes build --modes ext --repo ${PLATFORM_REPOSITORY}
-     sudo pip3 install -y lxml==3.4.0
+     sudo pip3 install lxml==3.4.0
  fi
  
  
@@@ -185,8 -185,6 +185,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