changes for redhat, adding redhat in if-loops

Change-Id: If15300879c3514c72b53a3a8e4f2fdaeaac23e45
Merge "changes for redhat, adding redhat in if-loops"