Merge "Fixes nova instance pinning defaults" into stable/colorado