add check for config-dir parameter (bug1101129)

Change-Id: I5cd454cc3c5bf5da9656c05e9a22385ffcd01147
Merge "add check for config-dir parameter (bug1101129)" into stable/folsom