Cosmetic changes to WAPackIaaS code for increasing readability
Making WAPackIaaS test categories more clear/useful
Fix to make WAPackIaaS functional tests work with new project organization
Merge pull request #2586 from spclark/dev

Update WAPackIaaS functional tests to accommodate project restructuring, misc. cleanup