Merge proposals dependent on lp://qastaging/~alexlauni/webapps-applications/webapps-application-hulu-player

1. webapps-application-hulu-player
2. Dependent merge proposals