CLOUDIFY-1620 Improved test stability and speed
CLOUDIFY-1620 Override recipe files using external files
Merge pull request #2 from CloudifySource/CLOUDIFY-1620

CLOUDIFY-1620 Improved test stability and speed (Reviewed by Nirb)