rbdmap: bugfix upstart script

It seems like the upstart script is lacking a little behind [the initscript](https://github.com/ceph/ceph/blob/master/src/init-rbdmap#L44-L49); however, this bugfix makes it actually do what it should do.

Before, the bug made the job just ignore all parameters, with the following error in /var/log/upstart/rbdmap.log:

```
rbd map volumes/volume-one
rbd: add failed: (22) Invalid argument
```

Signed-off-by: Stephan Renatus <s.renatus@x-ion.de>
Signed-off-by: Sage Weil <sage@inktank.com>
ReplicatedPG: CEPH_OSD_OP_WATCH should just create the object

Fixes: #7671
Signed-off-by: Samuel Just <sam.just@inktank.com>
PG::choose_acting: filter CRUSH_ITEM_NONE out of have

Fixes: #7672
Signed-off-by: Samuel Just <sam.just@inktank.com>
Merge remote-tracking branches 'origin/wip-7672' and 'origin/wip-7671' into wip-sam-testing2