Merge proposals dependent on lp://staging/~abreu-alexandre/ubuntu-html5-theme/fix-spacing-below-header

1. fix-spacing-below-header
2. Dependent merge proposals