Merge pull request #398 from fsharath/fsharath

rectified TestNG error
logic update to RhnMigrateClassicToRhsmWithMissingSystemIdFile_Test to
accommodate a Satellite server