Merge "Heat bridge cron 2.0, changes due to cloud and"