Updates to reading config in from file
Merge branch 'master' of https://github.com/eucalyptus/DeploymentManager
Check for local attr
Merge branch 'master' of https://github.com/eucalyptus/DeploymentManager
Merge branch 'master' of https://github.com/eucalyptus/DeploymentManager

Conflicts:
	config_manager/config.py
move property object to jsonmapping