[el6] refactor refactoring to repair lost functionality and ehance; should be re-testable now
[el6] refactor refactoring to repair lost functionality and ehance;
should be re-testable now

OpenISS/OpenISS,OpenISS/OpenISS,OpenISS/OpenISS,OpenISS/OpenISS,OpenISS/OpenISS,OpenISS/OpenISS,OpenISS/OpenISS