Merge "Enable remote_collector for OpenStack labs"