25514 Move all features into a features dir
25527 Test upgrades from previous versions
25527 7.x-1.0 is not available so skip
25527 Don't ask to upgrade db
25514 Move example content modules into sub-dirs
25527 Only test 2.x upgrades in 2.x branch
Also test this in 5.3
5.3 is broken. back out for now.
Merge pull request #208 from previousnext/25514-features-dirs

25514 Move all features into a features dir
Merge commit 'b308aee74b28f08dddccf76bd386ad41c1272a43' into 25527-test-upgrades
Merge pull request #209 from previousnext/25527-test-upgrades

25527 Test upgrades from previous versions
25538 Moved layouts to theme