separate checkpoints from enabled / disabled

Signed-off-by: Suhayb El Wardany <me@suw.me>
Merge remote-tracking branch 'origin/bugfix/disable-checkpoints' into develop