Update DesiredCapacity if AutoScalingGroup.desired_capacity is not None as fix for boto/boto#1757
Use appropriate unittest assertions for instance types in autoscaling tests
Merge pull request #1906 from oxtopus/issue-1757-update_desired_capacity

Update DesiredCapacity if AutoScalingGroup.desired_capacity is not None. Fixes #1906, #1757.