Regular expression change to accomodate edge cases.

Conflicts:
	chef/cookbooks/clouderamanager/recipes/node-setup.rb
Merge pull request #158 from vinayakponangi/pull-req-release-hadoop-2.3-master-a89a444baaf9df9166bed0e29ceeb14539a5e23c

THP Compaction changes merged into 2.3 from the Pebbles branch. [1/1]