Merge "hotspot2: add support for complete HomeSP subtree"