SAMR21 Build Failure Fixed. Build Failures happened due to structural re-organization of OpenStack.
Merge pull request #115 from mathivanane/FW-289-Fix

FW-291. Fix.