Make the overcloud query optional

Change-Id: I4f9c0b88016d25d5d339965c2a22174c228dd0f5
Merge "Make the overcloud query optional"