Merge pull request #134 from j-xiong/master

prov/psm: fix the configuration script
prov/psm: more fix for the configuration script

Previously the "auto" setting would fail when PSM is not present.

Signed-off-by: Jianxin Xiong <jianxin.xiong@intel.com>