Merge from trunk- Includes support for GENI Component wrapper