rename function for clarity
add new table for user attributes to user module upgrade
add bundles table addition upgrade
Merge pull request #1687 from craigh/upgardefix

Upgrade fix