#1016890 - a contributed fix for provision-save infinite loop when pulling options from stdin. happens to also fix cluster feature.