Merge changes to sync steps in OpenStack Observer back into EC2