Euca 7939

I'm honestly not sure why this includes more than just the expando/sgroup.js change.

just figured out 7894 was another branch which is waiting to merge. I mistakenly did "git pull origin maint/3.4/testing" instead of checking it out, so it merged that other branch with testing before I created this fix branch. I'll avoid doing that again!