Split 10.01 and 14.04 in to separate branches due to cookbook conflicts