Merge branch 'master' into mcc-nectar

Conflicts:
	roles/easy-rsa-CA-client/tasks/buildClientCert.yml
	roles/easy-rsa-CA-server/tasks/buildServerCert.yml
A template Playbook
Merge branch 'mcc-nectar' of github.com:monash-merc/ansible_cluster_in_a_box into mcc-nectar

Conflicts:
	roles/easy-rsa-CA-client/tasks/buildClientCert.yml
	roles/easy-rsa-CA-server/tasks/buildServerCert.yml
Removed iptables.j2
Updating nfs-server templates...
A template Playbook
Updating nfs-server templates...
Merge branch 'mcc-nectar' of github.com:monash-merc/ansible_cluster_in_a_box into mcc-nectar
Revert "Removed accidentally merged files"

This reverts commit 2eb17b205df6c0e18e6b778257f0bf2476ec83b2.

Conflicts:

	roles/nfs-server/templates/exports.j2
Deleted the iptables.j2 after the reversion.
Merge pull request #15 from monash-merc/mcc-nectar

Mcc nectar