CLOUDIFY-1709 - Fixed merge errors.
CLOUDIFY-2096 - Copyright/license text missing in shell validation classes.