Untested support for reading ec2_user_data from one's context.sh
Merge branch 'master' into parag_one_support

Conflicts:
	pilotservices/glideinwms_pilot/config.py
	pilotservices/glideinwms_pilot/user_data.py
Adding some more changes for one support
Working version of support for opennebula
Updated the rpm version string
Disable logging ec2_user_data for security reasons
Log the writing of ec2 user data but do not log the actual data
fixed a potential error condition which could prevent the VM from shutting down
refactored the different user data types into classes
Revert "refactored the different user data types into classes"

This reverts commit 12ba6b565e83c1dc79abdc5f336ef44ac9939290.
Revert "fixed a potential error condition which could prevent the VM from shutting down"

This reverts commit c95b8cacf515e367246be53d40da67f36bc391dc.
added /sbin and /usr/sbin to the path in order to pick up the shutdown command
added comments