finish roletask and test
Merge remote-tracking branch 'origin/master'

Conflicts:
	flyway/flow/roletask.py