[fix bug 891269] Allow functional areas to wrap.
[fix bug 898094] Use correct labels in services section of edit profile
Merge pull request #573 from hoosteeno/master

Fix minor bugs found during/after profile launch.
Merge remote branch 'upstream/master' into uniskills