Merge branch '3.3.1' into jpommer
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
fixed elb endpoint
Merge branch 'team/console/3.3.1' of git.eucalyptus-systems.com:eucalyptus into team/console/3.3.1
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
Fixes attempting to get deletion working.
EUCA-6558
use zone parameter in dashboard summary set get instances specific to selected zone
Connect up deletion to the correct list of scaling groups.
fixed loadbalancers collection ref in eucadata so periodic data pull will work
Merge branch 'team/console/3.3.1' of git.eucalyptus-systems.com:eucalyptus into team/console/3.3.1
Add 'Create scaling group from this launch config' option to launch config wizard, and the support code in main_container and scaling group wizard to use the passed in lc name.
Merge branch 'jpommer' into 3.3.1
Handle tags correctly.
EUCA-5170
added custom function to parse return value
EUCA-6558,
updated caching layer to pull updates from CLC faster after expiring cache due to modify operations