Fix and clean up Container api
Fix and clean up Container api

Change-Id: I2da4a58309f76224dd2097def121b4106d239fa5

eshijia/magnum,Alzon/SUR,ddepaoli3/magnum,eshijia/magnum,Tennyson53/magnum,ArchiFleKs/magnum,hongbin/magnum,eshijia/SUR,mjbrewer/testindex,sajuptpm/magnum,mjbrewer/testindex,Alzon/SUR,dimtruck/magnum,ramielrowe/magnum,ddepaoli3/magnum,mjbrewer/testindex,ffantast/magnum,annegentle/magnum,annegentle/magnum,hongbin/magnum,Tennyson53/SUR,openstack/magnum,paulczar/magnum,eshijia/SUR,jay-lau/magnum,openstack/magnum,Tennyson53/magnum,ffantast/magnum,ChengTiesheng/magnum,LaynePeng/magnum,ChengTiesheng/magnum,dimtruck/magnum,sajuptpm/magnum,ArchiFleKs/magnum,paulczar/magnum,LaynePeng/magnum,Tennyson53/SUR,ramielrowe/magnum