Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/rusticcanyon-jndn-management