EUCA-4876
this required back-porting a fix I put in 3.3 devel to handle some new objects that boto produces