CLOUDSTACK:6915 search including removed
Merge branch '4.5' of https://git-wip-us.apache.org/repos/asf/cloudstack into 4.5