Closes #CDB-1179 Moves 'Label Placement' option below 'Label Overlap'
Merge CDB-1179 into release/2.8.3