Fix to machine imaging test case, added API test cases for Volume
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Added migration script for batch processing images from Euca-->OpenStack
Added include_admin feature from master branch rtwo (Re-install requirements!)
Typo in test case
Code cleanup
deleted comments
Allow for importing the script
Updated account manager to include a role if none is given
Sharing an image will also add core-services + admin accounts
Small changes made in production during the unexpected maint.
Changes to init files
Merged conflicts
Changes to serializers, instance
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
MachineRequest, Machine, Instance updates

* Serializer for machine request shows machine alias rather than db id
* Serializer for provider machine shows start/end date of specific machine,
 rather than DB start/end date for generic machine
* Support for sharing image with admin and owner
* Meta drivers should be initialized with an admin driver to support generic
 providers
* set_instance_from_metadata can be run on core instances and converted
 instances
* Do not apply metadata until the esh instance is out of the 'build' state
  (Avoid throwing an exception at this point, in stead just 'wait it out' until
  the instance is out of the 'build' state)
* REMOVED support for ProviderMachine cache, as it was causing errors during
 testing. Caching will be re-addressed at the 'rtwo/driver' level.
* Support for retrieving tenant name of machine owner, aids in organization of
 image storage as a hierarchy <name>/<instance_or_image_id>/
* Explicitly list the 'node_dict' necessary for direct SCP connection
 (For eucalyptus node controller)
* Freeze instance task takes identity_id, rather than machine_request_id

	modified:   api/machine_request.py
	modified:   api/serializers.py
	modified:   core/models/instance.py
	modified:   core/models/machine.py
	modified:   core/models/machine_request.py
	modified:   service/tasks/machine.py
Big Change: Moving secrets out of settings!

All provider-specific secrets have been removed from 'atmosphere/settings' and
now reside only in atmosphere/settings/secrets.py
Atmosphere settings should *NEVER* be connected to the 'secrets' from now on.

Other notable changes:
* Admin driver initialization of meta driver to get multi-provider support for
 occupancy
* Test cases will reuse an instance, if one exists and is ready for use.
* Updated test support for volume, machine imaging and migration
* Machine request tests will 'initialize' a list of machine and size for better
 test coverage (NOTE: Eucalyptus image tests have been removed because node SCP
 information was required for testing)
* DEBUG mode is now the first line of settings, it should NEVER be changed in
 settings/__init__.py. It should be changed in settings/local.py.
* Removed duplicate code in authentication/protocol/ldap.py
* Added support for 'scripts/set_permissions.sh' to include the default
 atmosphere environment
* Created a new 'deploy_failed' task that will help keep track of instances
 that have an error during deployment/launch
	modified:   api/occupancy.py
	modified:   api/tests/__init__.py
	modified:   api/tests/test_machine_imaging.py
	modified:   api/tests/test_volume.py
	modified:   atmosphere/settings/__init__.py
	modified:   atmosphere/settings/local.py.dist
	modified:   authentication/decorators.py
	modified:   authentication/protocol/cas.py
	modified:   authentication/protocol/ldap.py
	modified:   authentication/protocol/oauth.py
	modified:   authentication/views.py
	modified:   core/ldap.py
	modified:   core/migrations/0011_build_created_by_identity.py
	modified:   core/migrations/0016_build_provider_admin_and_creds.py
	modified:   core/migrations/0018_build_accountprovider.py
	modified:   core/models/group.py
	modified:   core/models/provider.py
	modified:   core/tests/__init__.py
	modified:   scripts/add_openstack_user.py
	modified:   scripts/euca_instance_report.py
	modified:   scripts/generate_openstack.py
	modified:   scripts/import_core_services.py
	modified:   scripts/import_users_from_euca.py
	modified:   scripts/import_users_from_openstack.py
	modified:   scripts/migrate_images.py
	modified:   scripts/set_permissions.sh
	modified:   service/accounts/openstack.py
	modified:   service/instance.py
	modified:   service/quota.py
	modified:   service/tasks/driver.py
	modified:   service/tasks/volume.py
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere