Merging toolbar porltet manager on portlets
Merge remote-tracking branch 'origin/barcelona' into remove-dt-dl-dd