rework for 157634
rework for 157634

https://rtc3srv1.tivlab.raleigh.ibm.com:9443/ccm/web/projects/BigFix%20Platform#action=com.ibm.team.workitem.viewWorkItem&id=157634
bigfix/developer.bigfix.com,bigfix/developer.bigfix.com,bigfix/developer.bigfix.com