Merge proposals dependent on lp://qastaging/~justinmcp/unity-webapps-pandora/fix-module-imports

1. fix-module-imports
2. Dependent merge proposals