SpotInstance and LBHC Support
Merge branch '2014.05a' into 2014.05