Fixes for the RHEL version of the controller node

Patchset fixes the build also.

Change-Id: Ia33227971be21ddff64ccc194a2bac0fcc9d9830