Merge pull request #538 from hhovsepy/sam-1.3

added more checks for beaker machine architectures
Add new scenarios(create multiple orgs,users,roles and delete some) for sam-upgrade
Merge pull request #539 from tkolhar/sam-1.3

Add new scenarios(create multiple orgs,users,roles and delete some) for sam-upgrade
added more scenarios for upgrade