bug #3300: Fix oneuser login for ruby 1.8.7
bug #3321: Update references to EC2_INSTANCE_TYPE