Allow configuring cli/cli_dir

The default cli_dir is /usr/local/bin, but sometimes package install to
/usr/bin. This patch allows it to be customized

Change-Id: I0f6ec8e46224d039846bdd0b487d6fea0e819508
(cherry picked from commit fc79e2fb091eefddca57986d0510a59a911ff316)
Merge "Allow configuring cli/cli_dir" into stable/havana