Changes

UPSTREAM: 45741: Fix discovery version for autoscaling to be v1
The order of the storage setup blocks in the setup for the autoscaling 
API group was accidentally inverted, meaning that if the v2alpha1 API 
group was turned on, it would be set to the preferred API group-version 
for discovery.
This was unintentional; the latest stable version should (v1) should be 
preferred instead.
Fixes bug 1452021 (https://bugzilla.redhat.com/show_bug.cgi?id=1452021)
 (commit: 59eac28)