SAMR21 Build Failure Fixed. Build Failures happened due to structural re...

SAMR21 Build Failure Fixed. Build Failures happened due to structural re-organization of OpenStack.