Feature/junjun pre 2.3

This is a pull request for the 2.3 release.  I think this is ready to go.  Both Junjun and I have tested it on OpenStack and AWS.