removed unrelated changes for easier review
Merge branch '7.x-1.x-develop' of github.com:beatchristen/commerce_checkout_progress into 7.x-1.x-develop