Merge pull request #380 from mmeisinger/fix_OOIION1010

Fix OOIION-1010 part 1
change deployed_site attribute to a list
Refined extended device YML definitions
Merge commit '67e8be6'
Reverted change of deployed_site type