Revert 17c5ee87

This change effectively reverts 17c5ee87, but leaves in some additional
comments added by that commit.  We also update the cloudserver-aio.sh
script to reflect this reverted change.

As to why this change is no longer needed, the assumptions that needing
a separate cloud files tenant ID to form your glance swift user name
was incorrect.  Using the format of <cloud_tenant_id:cloud_username>
works fine.

Closes issue #281