Add a few options that will be used for sonar

Add a few configuration option for further sonar review.

Change-Id: I82b92e291791e838b18b6c9281225ba44161cceb