Merge "Change OpenStack Deploy job parameters to choice"