Commented out brittle test for nightly build
Refined prepare resource support and added prepare InstrumentAgentInstance
Merge pull request #1075 from shenrie/master

Refined prepare resource support and added prepare InstrumentAgentInstance
merge upstream/master