Merge pull request #8437 from lodr/bug-835928-cc-settings

Bug 835928 - Fixing height, border gaps, alignement, plantype selector and dates
Cause r+(cherry picked from commit a9c63e3b984b527be15b98dd25b54ffe9c6ac4fc)

Conflicts:
	apps/costcontrol/style/views/telephony.css