Merge pull request #971 from eucalyptus/GUI-1309

GUI-1309 - supplies dummy args to AWSAuthConnection since some envs seem to need it
GUI-129
ensure connection.ssl.certfile setting gets to the boto connection class
GUI-129
fixed typo
Merge pull request #987 from eucalyptus/GUI-129

GUI-129 ensure connection.ssl.certfile setting gets to the boto connection class
merge of v4.0.1
Fix failing unit test
Merge pull request #1039 from eucalyptus/merging-4.0.1

merge of v4.0.1
Merge branch 'develop' into merge-maint-4.0

Conflicts:
	eucaconsole/forms/__init__.py
	eucaconsole/forms/scalinggroups.py
	eucaconsole/forms/snapshots.py
	eucaconsole/forms/volumes.py
	eucaconsole/static/js/pages/instance_launch.js
	eucaconsole/static/js/pages/launchconfig_wizard.js
	eucaconsole/static/js/pages/scalinggroup.js
	eucaconsole/static/js/widgets/securitygroup_rules.js
	eucaconsole/templates/master_layout.pt
	eucaconsole/views/instances.py
	eucaconsole/views/launchconfigs.py
Removed unused import
Merge branch 'develop' into merge-maint-4.0

Conflicts:
	eucaconsole/static/js/widgets/securitygroup_rules.js
Merge branch 'develop' into merge-maint-4.0
Revert curlyfront/curlyback escaping to avoid breaking JSON string passing across the app.
Fix test
Merge pull request #1042 from eucalyptus/merge-maint-4.0

Merge maint-4.0 into develop