Merge branch 'team/console/3.3.1' of git.eucalyptus-systems.com:eucalyptus into 3.3.1
Increasing the iscsiadm login timeout

Partial fix for EUCA-6913
EUCA-6941 Backport: EUCA-6817 Meta Data failing during BFEBS tests
EUCA-3783
allowed characters from EC2-VPC standard. note this might still be more liberal than EC2-Classic
Merge branch 'team/console/3.3.1' of git.eucalyptus-systems.com:eucalyptus into team/console/3.3.1
Merge branch '3.3.1' into jpommer
Merge branch 'EUCA-5499' into jpommer
Merge branch 'EUCA-6528' into jpommer

Conflicts:
	console/static/js/keypair.js
Merge branch 'EUCA-6554' into jpommer
Merge branch 'EUCA-6779' into jpommer
Merge branch 'maint/3.3/testing' of git.eucalyptus-systems.com:eucalyptus into maint/3.3/testing
Merge branch 'EUCA-6554' into maint/3.3/testing
Merge branch 'EUCA-6779' into maint/3.3/testing
Merge branch 'EUCA-5499' into maint/3.3/testing
Merge branch 'EUCA-6528' into maint/3.3/testing

Conflicts:
	console/static/js/keypair.js
fixed elb endpoint
Merge branch 'team/console/3.3.1' of git.eucalyptus-systems.com:eucalyptus into team/console/3.3.1
merged
Added a check to .isNew() that looks for the ARN from the backend.
This allows newly created scaling groups to be saved by disabling
the normal Backbone primary key semantics for isNew().

Also bound the launch config pull down to populate proper scaling
group field.
Merge branch 'team/console/3.3.1' of git.eucalyptus-systems.com:eucalyptus into 3.3.1