tweaking gitignore
remving JustCode files
merge conflicts
more merge conflicts
even more merge conflicts
final cherry pick
final tweaks
final cherry pick from the RabbitMQ branch